Implement fix ups using `step(step)`.

Closes #236.