More adjustments to make lexer conform to the parser.