Merged lexer enhancements.