Lexer changes

Mostly minor things that rebasing is becoming painful.
I am also wondering that. I haven't been able to find them :\