I like that you pulled this out. It will protect our matcher method signature over time.