Refactoring. Use Token::Match instead of hardcoded patterns to increase readability.
removed some redundant null pointer checks before calling Token::Match