Clean up some control flow stuff in pipeline after basic block simplification