Get rid of the EdgeMapping map. Instead, just check for BasicBlock