More refactoring on Skip::next

Using simple assignments instead of mem::replace