Don't organise parameters by optionality.
Merge branch 'master' into data_beta