(Pes) Word order regarding ra + cleanup and renaming

src/persian/PhrasePes.gf

@@ -3,25 +3,25 @@ concrete PhrasePes of Phrase = CatPes ** open Prelude, ResPes in {
   lin
     PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
 
-    UttS s = s ;
     UttQS qs = {s = qs.s ! QDir} ;
     UttImpSg pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Sg False} ;
     UttImpPl pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Pl False} ;
     UttImpPol pol imp = {s = pol.s ++ imp.s ! contrNeg True pol.p ! ImpF Sg True} ;
 
-    UttIP ip = {s = ip.s } ; --- Acc also
-    UttIAdv iadv = iadv ;
-    UttNP np = {s = np.s !  Bare} ;
-    UttVP vp = {s = vp.ad ++ vp.comp ! Ag Sg P3 ++ vp.obj.s ++ vp.inf ++ vp.vComp ! Ag Sg P3 ++ vp.embComp} ;
-    UttAdv adv = {s = adv.s } ;
-	UttCN cn = {s = cn.s ! Sg ! Bare };
-    UttCard n = n ;
+    UttS,
+    UttIP, --- Acc also
+    UttAdv,
+    UttIAdv,
+    UttCard = \ss -> ss ;
+
+    UttNP np = {s = np2str np} ;
+  	UttCN cn = {s = cn2str cn};
     UttAP ap = {s = ap.s ! Bare} ;
+    UttVP vp = {s = showVPH VPInf defaultAgr vp} ;
 
+    PConjConj conj = {s = conj.s2} ;
+
+    NoVoc,
     NoPConj = {s = []} ;
-    PConjConj conj = {s = conj.s2} ; ---
-
-    NoVoc = {s = []} ;
-    VocNP np = {s = np.s !  Bare} ;
-
+    VocNP = UttNP ;
 }