Upgrade the lexer a bit