CFG: better goto and if handling