diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf
index ca515778..781976d3 100644
--- a/src/albanian/CatSqi.gf
+++ b/src/albanian/CatSqi.gf
@@ -1,6 +1,4 @@
 concrete CatSqi of Cat = CommonX ** open ParamX,Prelude,ResSqi in {
-  flags
-    coding = "UTF-8" ;
   lincat A = Adj ;
   lincat A2 = Adj ** {c2 : Compl} ;
   lincat V, VA, VV, VS, VQ = Verb ;
diff --git a/src/armenian/CatHye.gf b/src/armenian/CatHye.gf
index 2da59320..08bbeff0 100644
--- a/src/armenian/CatHye.gf
+++ b/src/armenian/CatHye.gf
@@ -1,12 +1,6 @@
 concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
-  flags
-    coding = "UTF-8" ;
-  lincat A = {s : Case => Number => Str; def_dat : Number => Str;
-              def_nom : Number => Str; poss1 : Case => Number => Str;
-              poss2 : Case => Number => Str} ;
-  lincat A2 = {s : Case => Number => Str; def_dat : Number => Str;
-               def_nom : Number => Str; poss1 : Case => Number => Str;
-               poss2 : Case => Number => Str; c2 : {s : Str; c : Case}} ;
+  lincat A = Adj ;
+  lincat A2 = Adj ** {c2 : Compl} ;
   lincat ACard = {s : Str} ;
   lincat AP = {} ;
   lincat CN = {s : Case => Number => Str; def_dat : Number => Str;
@@ -28,16 +22,9 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
   lincat IQuant = {s : Str} ;
   lincat Imp = {s : Str} ;
   lincat LN = {s : Str} ;
-  lincat N = {s : Case => Number => Str; def_dat : Number => Str;
-              def_nom : Number => Str; poss1 : Case => Number => Str;
-              poss2 : Case => Number => Str} ;
-  lincat N2 = {s : Case => Number => Str; def_dat : Number => Str;
-               def_nom : Number => Str; poss1 : Case => Number => Str;
-               poss2 : Case => Number => Str; c2 : {s : Str; c : Case}} ;
-  lincat N3 = {s : Case => Number => Str; def_dat : Number => Str;
-               def_nom : Number => Str; poss1 : Case => Number => Str;
-               poss2 : Case => Number => Str; c2 : {s : Str; c : Case};
-               c3 : {s : Str; c : Case}} ;
+  lincat N = Noun ;
+  lincat N2 = Noun ** {c2 : Compl} ;
+  lincat N3 = Noun ** {c2,c3 : Compl} ;
   lincat NP = {s : Case => Number => Str; def_dat : Number => Str;
                def_nom : Number => Str; poss1 : Case => Number => Str;
                poss2 : Case => Number => Str} ;
@@ -46,7 +33,7 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
   lincat Ord = {s : Str} ;
   lincat PN = {s : Str} ;
   lincat Predet = {s : Str} ;
-  lincat Prep = {s : Str; c : Case; lock_Prep : {}} ;
+  lincat Prep = Compl ;
   lincat Pron = {s : Str} ;
   lincat QCl = {s : Str} ;
   lincat QS = {s : Str} ;
@@ -58,68 +45,10 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
   lincat SN = {s : Str} ;
   lincat SSlash = {s : Str} ;
   lincat Subj = {s : Str} ;
-  lincat V = {s : Str; causative : Str;
-              conditional : Aspect => Person => Number => Str;
-              converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-              imperative : Number => Str; passive : Str;
-              past : Person => Number => Str; participle : PartType => Str;
-              subjunctive : Aspect => Person => Number => Str} ;
-  lincat V2 = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str;
-               c2 : {s : Str; c : Case}} ;
-  lincat V2A = {s : Str; causative : Str;
-                conditional : Aspect => Person => Number => Str;
-                converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-                imperative : Number => Str; passive : Str;
-                past : Person => Number => Str; participle : PartType => Str;
-                subjunctive : Aspect => Person => Number => Str;
-                c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
-  lincat V2Q = {s : Str; causative : Str;
-                conditional : Aspect => Person => Number => Str;
-                converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-                imperative : Number => Str; passive : Str;
-                past : Person => Number => Str; participle : PartType => Str;
-                subjunctive : Aspect => Person => Number => Str;
-                c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
-  lincat V2S = {s : Str; causative : Str;
-                conditional : Aspect => Person => Number => Str;
-                converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-                imperative : Number => Str; passive : Str;
-                past : Person => Number => Str; participle : PartType => Str;
-                subjunctive : Aspect => Person => Number => Str;
-                c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
-  lincat V2V = {s : Str; causative : Str;
-                conditional : Aspect => Person => Number => Str;
-                converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-                imperative : Number => Str; passive : Str;
-                past : Person => Number => Str; participle : PartType => Str;
-                subjunctive : Aspect => Person => Number => Str;
-                c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
-  lincat V3 = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str;
-               c2 : {s : Str; c : Case}; c3 : {s : Str; c : Case}} ;
-  lincat VA = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str} ;
+  lincat V = Verb ;
+  lincat VV,VS,VQ,VA = Verb ;
+  lincat V2 = Verb ** {c2 : Compl} ;
+  lincat V3,V2A,V2S,V2Q,V2V = Verb ** {c2,c3 : Compl} ;
   lincat VP = {s : Case => Number => Str;
                conditional : Aspect => Person => Number => Case => Number => Str;
                converb : {imperfective : Case => Number => Str;
@@ -139,25 +68,4 @@ concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
                     imperative : Number => Str; passive : Str;
                     past : Person => Number => Str; participle : PartType => Str;
                     subjunctive : Aspect => Person => Number => Str; lock_V : {}} ;
-  lincat VQ = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str} ;
-  lincat VS = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str} ;
-  lincat VV = {s : Str; causative : Str;
-               conditional : Aspect => Person => Number => Str;
-               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
-                               negative : Str; perfective : Str; simultaneous : Str};
-               imperative : Number => Str; passive : Str;
-               past : Person => Number => Str; participle : PartType => Str;
-               subjunctive : Aspect => Person => Number => Str} ;
-}
\ No newline at end of file
+}
diff --git a/src/kazakh/CatKaz.gf b/src/kazakh/CatKaz.gf
index 63722ccf..5ca809f4 100644
--- a/src/kazakh/CatKaz.gf
+++ b/src/kazakh/CatKaz.gf
@@ -1,8 +1,6 @@
 concrete CatKaz of Cat = CommonX ** open Prelude,ResKaz in {
-  flags
-    coding = "UTF-8" ;
   lincat A = {s : Str} ;
-  lincat A2 = {s : Str; lock_A : {}; c2 : {s : Str}} ;
+  lincat A2 = A ** {c2 : Compl} ;
   lincat ACard = {s : Str} ;
   lincat AP = {s : Str} ;
   lincat CN = {s : Case => Str} ;
@@ -35,7 +33,7 @@ concrete CatKaz of Cat = CommonX ** open Prelude,ResKaz in {
   lincat Ord = {s : Str} ;
   lincat PN = {s : Str} ;
   lincat Predet = {s : Str} ;
-  lincat Prep = {s : Str} ;
+  lincat Prep = Compl ;
   lincat Pron = {s : Str} ;
   lincat QCl = {s : Str} ;
   lincat QS = {s : Str} ;
@@ -47,81 +45,10 @@ concrete CatKaz of Cat = CommonX ** open Prelude,ResKaz in {
   lincat SN = {s : Str} ;
   lincat SSlash = {s : Str} ;
   lincat Subj = {s : Str} ;
-  lincat V = {infinitive : Str;
-              indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-              imperative : Polarity => Formality => Number => Str;
-              subjunctive : Person => Number => Str} ;
-  lincat V2 = {infinitive : Str;
-               indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str; c2 : {s : Str}} ;
-  lincat V2A = {infinitive : Str;
-                indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-                imperative : Polarity => Formality => Number => Str;
-                subjunctive : Person => Number => Str; c2 : {s : Str};
-                c3 : {s : Str}} ;
-  lincat V2Q = {infinitive : Str;
-                indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-                imperative : Polarity => Formality => Number => Str;
-                subjunctive : Person => Number => Str; c2 : {s : Str}} ;
-  lincat V2S = {infinitive : Str;
-                indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-                imperative : Polarity => Formality => Number => Str;
-                subjunctive : Person => Number => Str; c2 : {s : Str}} ;
-  lincat V2V = {infinitive : Str;
-                indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-                imperative : Polarity => Formality => Number => Str;
-                subjunctive : Person => Number => Str; c2 : {s : Str};
-                c3 : {s : Str}} ;
-  lincat V3 = {infinitive : Str;
-               indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str; c2 : {s : Str};
-               c3 : {s : Str}} ;
-  lincat VA = {infinitive : Str;
-               indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str} ;
+  lincat V = Verb ;
+  lincat VV,VS,VQ,VA = Verb ;
+  lincat V2 = Verb ** {c2 : Compl} ;
+  lincat V3,V2A,V2S,V2Q,V2V = Verb ** {c2,c3 : Compl} ;
   lincat VP = {infinitive : Case => Str;
                indicative : {fut : Case => Str;
                              pres : {progressive : Polarity => Case => Str;
@@ -139,31 +66,4 @@ concrete CatKaz of Cat = CommonX ** open Prelude,ResKaz in {
                                     noAspect : Polarity => Person => Number => Str}};
                     imperative : Polarity => Formality => Number => Str;
                     subjunctive : Person => Number => Str} ;
-  lincat VQ = {infinitive : Str;
-               indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str} ;
-  lincat VS = {infinitive : Str;
-               indicative : {fut : Str;
-                            pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                            past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str} ;
-  lincat VV = {infinitive : Str;
-               indicative : {fut : Str;
-                             pres : {progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str};
-                             past : {perfect : Polarity => Person => Number => Str;
-                                    progressive : Polarity => Person => Number => Str;
-                                    noAspect : Polarity => Person => Number => Str}};
-               imperative : Polarity => Formality => Number => Str;
-               subjunctive : Person => Number => Str} ;
-}
\ No newline at end of file
+}
diff --git a/src/macedonian/NamesMkd.gf b/src/macedonian/NamesMkd.gf
index db236ee7..c9b3caf0 100644
--- a/src/macedonian/NamesMkd.gf
+++ b/src/macedonian/NamesMkd.gf
@@ -1,6 +1,4 @@
 concrete NamesMkd of Names = CatMkd ** open Prelude,ResMkd in {
-  flags
-    coding = "UTF-8" ;
   lin AdjLN ap ln = {s = ap.s ! Indef ! GSg Masc ++ ln.s} ;
   lin FemaleSurname sn = {s = \\r => sn.s; vocative = sn.s;
                           a = {g = GSg Masc; p = P1}} ;
@@ -17,4 +15,4 @@ concrete NamesMkd of Names = CatMkd ** open Prelude,ResMkd in {
                     a = {g = GSg Masc; p = P1}} ;
   lin UseLN ln = {s = \\r => ln.s; vocative = ln.s;
                   a = {g = GSg Masc; p = P1}} ;
-}
\ No newline at end of file
+}