Next round of lexer and parser refinements.