Refactoring match_token, etc.