Optimized ControlFlowList a bit