REPORT-114 - Support the case where not all parameter values are specified in the iteration (by mapping others straight through); Improve naming of the parameter value columns for consistency with other places.