Additionally reorder so that the arguments list matches the
order of the arguments in the function declaration.