Decouple next-stepping a bit