Merging lexer enhancements.