More cleanup around ExecutionPlanBuilder