Refactoring: Merge overlapping Token::Match function calls