FWIW, by changing to using the ordering of the parameter array means that this re-keying will not be necessary.