Lexer changes

Mostly minor things that rebasing is becoming painful.
It renders poorly, but there is a space after that `.` Also valid: `1.+2.`