More refactoring of skip().