Update arguments passed to cmp.Diff to be in conventional order