Change FilterFactory code to pass in the actual Description

I still need to write more tests, but I wanted to send this out for an early look.
The reason the code was written the way it was because both code paths call `filterSpecs.add(filterSpec)`, so I would rather leave it the way it is.