Yup.  I think that at the point in time when that happens I'd like to see if we can refactor `query.clj` a bit so that we can still separate the logic into type-specific namespaces if possible.  OK with you if we leave these here for now, anyway?