Continue refactoring InputFilterBuilder