FieldFilter and related refactoring.