CFGEdgeBuilder.java: Code cleanup