Improved lexical analysis.