Improve whitespace handling

[cwbaker]

Scan for whitespace until no whitespace token matches and reset the position to the start of scanning so that whitespace prefixes that are also valid tokens aren't skipped.