Don't rely on argsort to sort - directly match to order in parameter list