[CommandEvaluator refactor] Re-order _Dispatch to commands