Wrap lines in spec, remove step_into