Reorder some arguments.