This moves all the regular flags back together (for aesthetic reasons), and
makes room for more GUC_UNIT_* types.