Hopefully final attempt at a more convenient, but still backwards-compatible, version of CompositionCohortDefinition.addSearch