Tidy up error messages in Lexer