Shorten some of the cases in the lexer