fixup! Removing templatization of main AutoFilterDescriptor and AutoFilterDescriptorStub constructors