Lexer changes

Mostly minor things that rebasing is becoming painful.
It is guaranteed to be ASCII.