Refactoring how parameters are handled in preparation for multiaggregate
support.