Compatibility fixes to work with control-flow-graph 1.0