Reorder some of the config options.