Clean up skip_while iteration