Reorder, more on dev builds.