Some code moved from stepper! to predictor