Cleaner and simpler skipping