Expand the pass to unify all of the unwind blocks as well