Revert "Loosen typing of "searches" on CompositionCohortDefinition"

(The reverted fix changed method signatures too significantly.)

This reverts commit 13aca668b2e498cf1b87f9a54b7f6ca36a3f223d.
Convenience method for adding a search to a CompositionCohortDefinition with a mappings string