Lexer and parser fixes.