Performance fix for encounter data set definitions where both base cohort and base idset are entered.