Including EvaluateStepExecution in the same compilation unit for readability.
Also adding a couple comments about things that might not yet work.