Clean up control flow graph to be a bit more friendly to interoperating languages