Refactoring: every matcher string should look the same