Fix argument ordering to be consistent.