bug 1138: Reorder fields to better show which variables belong together