Better organizing the lexer token sets