finish most of the control flow merging, need to tie together all returns from bb_forward_sweep