Match refactoring.