Put conjunctions at the filter group level.

Originally, I was associating a conjunction with each filter in a filter
group. However, it is more natural to give each filter in a group the
same conjunction. I also added some code to allow nested filter groups
to be optimized.