Properly fix steps committed in haste

And tidy up features that were relying on old broken behaviour of the step.