Fixed up control file ordering with wrap-and-sort.