Extract FilterMatcher into CallbackMatcher

Adds support for both _action and _filter callbacks
Add in `around_filter` support