BUG-5626: split out CohortEntry