Fix up PHI nodes correctly in the presence of unreachable BBs, part two. Also