takeWhile: Further simplification