Simplify this code; it can use the regular CFG utlities rather than