Further simplify skipUntil