Refactor filters to all use around filters.