Fix simplifier by reflecting changes in block relations in the CFG