Reorder variables to match usage.