Lexer changes

Mostly minor things that rebasing is becoming painful.
Probably. @jbclements what should be done here?