Forgot to mention, that there might be a 3rd solution as well:

* Refactor, to merge the `RegisteredServiceDefaultAttributeFilter` and `RegisteredServiceAttributeFilter`, such that each registered service:

1. Is by default associated with a default filter
2. Each filter is forcefully passed down the collection of attributes that the default filter can cope with.

Slightly bigger in scope, but perhaps a better solution than the others.