Yeah, 'nexts' were there before - I think you had a note on #91 to further consider the logic there, but I didn't quite understand what all this section was doing, so I left it alone.