Remove CollectionFilter -- it doesn't seem like the right approach for
now.