Cleaning up the DataFilterFactory implementation.