Properly fix up BB succ/pred.

Also remove a hack that kept things falsely alive before.