unified: Group enum entries

Same as in the preceding commit.