Improve error messages by supplying the used lexer name
have TokenStreamSelector support optional
whitespace acrobatics to improve readability