Lexer changes

Mostly minor things that rebasing is becoming painful.
Would it be wrong to just check if the next was a digit?