Straight arrow-ify things that are implicitly applying step.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Get step back in.

Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>