The word 'filter' isn't long for this world.  This pr and the AttributeAggregator removal should be most of the pre-refactoring I want to do.  After that, it'll be time to get down to business.