Extra token types for single-character operators.  Multiple categories per token.  Filter out categories while iterating over tokens.