Improve lexer speed, and support propper keyword handling