Various small consistency tweaks for new step templates.