Using new lexer code. Improved for clarity.
Merge resolve.