Reworked report builders so that parameters are:
* Mapped straight through to data sets in cohort reports
* Generated from calculation parameters in calculation-based reports