Refactor g:CreateExecutionPlan a little
Fix coffee and C++ for new system