Use OrderParameterFunctions (#4363)