Clean up some problems with extra CFG edges being introduced during