Turn Step and StepInvocation inside out
Tidy