Reorder TabletType in structs: better consistency