I suspect just calling next is all we really need, as we likely want to avoid going via stop if we can, but haven't really thought this through yet.