Add consistent arg ordering.