Fix up evolve step.
Fix evolve steps that were missed on first pass.