collapse StepContext into Fluent.Step

#51