Made TakingWhile slightly more strict