Fix some fragile code wrt CFG edge updating.