Re-order new fetch args so everything is backwards compatible.