Group legacy matcher deprecations together using type key

Fixes #468