unit: Consolidate disjointed unitOption sections in unit.Serialize