Rearrange variables for consistency.