Pass whitespace explicitly to parser(lexer). Update WS token definition to include comments.