REPORT-560 - Make it easier to rename parameters on a cohort definition
REPORT-561 - More convenient data set definitions for working with cohorts