Index: branches/apertium-tagger/experiments/mtx/commondefns.mtx
===================================================================
--- branches/apertium-tagger/experiments/mtx/commondefns.mtx	(revision 71686)
+++ branches/apertium-tagger/experiments/mtx/commondefns.mtx	(revision 71687)
@@ -1,4 +1,4 @@
-<def-global as="flattags_0">
+<def-macro as="flattags_0">
   <join>
     <for-each as="wordoid">
       <ex-wordoids>
@@ -14,8 +14,8 @@
       </join>
     </for-each>
   </join>
-</def-global>
-<def-global as="flattags_m1">
+</def-macro>
+<def-macro as="flattags_m1">
   <join>
     <for-each as="wordoid">
       <ex-wordoids>
@@ -31,8 +31,8 @@
       </join>
     </for-each>
   </join>
-</def-global>
-<def-global as="flattags_m2">
+</def-macro>
+<def-macro as="flattags_m2">
   <join>
     <for-each as="wordoid">
       <ex-wordoids>
@@ -48,20 +48,20 @@
       </join>
     </for-each>
   </join>
-</def-global>
-<def-global as="surf_0_s3">
+</def-macro>
+<def-macro as="surf_0_s3">
   <slice start="-3">
     <ex-surf>
       <tokaddr />
     </ex-surf>
   </slice>
-</def-global>
-<def-global as="surf_0">
+</def-macro>
+<def-macro as="surf_0">
   <ex-surf>
     <tokaddr />
   </ex-surf>
-</def-global>
-<def-global as="surf_m1">
+</def-macro>
+<def-macro as="surf_m1">
   <ex-surf>
     <add>
       <tokaddr />
@@ -68,8 +68,8 @@
       <int val="-1" />
     </add>
   </ex-surf>
-</def-global>
-<def-global as="surf_m1_s3">
+</def-macro>
+<def-macro as="surf_m1_s3">
   <slice start="-3">
     <ex-surf>
       <add>
@@ -78,8 +78,8 @@
       </add>
     </ex-surf>
   </slice>
-</def-global>
-<def-global as="surf_m2">
+</def-macro>
+<def-macro as="surf_m2">
   <ex-surf>
     <add>
       <tokaddr />
@@ -86,8 +86,8 @@
       <int val="-1" />
     </add>
   </ex-surf>
-</def-global>
-<def-global as="surf_p1">
+</def-macro>
+<def-macro as="surf_p1">
   <ex-surf>
     <add>
       <tokaddr />
@@ -94,8 +94,8 @@
       <int val="1" />
     </add>
   </ex-surf>
-</def-global>
-<def-global as="surf_p1_s3">
+</def-macro>
+<def-macro as="surf_p1_s3">
   <slice start="-3">
     <ex-surf>
       <add>
@@ -104,8 +104,8 @@
       </add>
     </ex-surf>
   </slice>
-</def-global>
-<def-global as="surf_p2">
+</def-macro>
+<def-macro as="surf_p2">
   <ex-surf>
     <add>
       <tokaddr />
@@ -112,15 +112,15 @@
       <int val="2" />
     </add>
   </ex-surf>
-</def-global>
-<def-global as="lemma_0">
+</def-macro>
+<def-macro as="lemma_0">
   <ex-lemma>
     <ex-wordoid>
       <wrdaddr />
     </ex-wordoid>
   </ex-lemma>
-</def-global>
-<def-global as="suffix_1_0">
+</def-macro>
+<def-macro as="suffix_1_0">
   <slice end="1">
     <ex-lemma>
       <ex-wordoid>
@@ -128,8 +128,8 @@
       </ex-wordoid>
     </ex-lemma>
   </slice>
-</def-global>
-<def-global as="suffix_3_0">
+</def-macro>
+<def-macro as="suffix_3_0">
   <slice end="1">
     <ex-lemma>
       <ex-wordoid>
@@ -137,4 +137,4 @@
       </ex-wordoid>
     </ex-lemma>
   </slice>
-</def-global>
+</def-macro>
Index: branches/apertium-tagger/experiments/mtx/kaztags.mtx
===================================================================
--- branches/apertium-tagger/experiments/mtx/kaztags.mtx	(revision 71686)
+++ branches/apertium-tagger/experiments/mtx/kaztags.mtx	(revision 71687)
@@ -104,88 +104,88 @@
     <!-- Major tag (all wordoids) -->
     <feat>
       <out>
-        <var name="major_tag_0" />
+        <macro name="major_tag_0"></macro>
       </out>
     </feat>
     <!-- Full tag (all wordoids) -->
     <feat>
       <out>
-        <var name="wrd_flattags_0" />
+        <macro name="wrd_flattags_0"></macro>
       </out>
     </feat>
     <!-- Lemma, Major tag (headwords) -->
     <feat>
       <pred>
-        <var name="is_headword" />
+        <macro name="is_headword"></macro>
       </pred>
       <out>
-        <var name="lemma_0" />
+        <macro name="lemma_0"></macro>
       </out>
       <out>
-        <var name="major_tag_0" />
+        <macro name="major_tag_0"></macro>
       </out>
     </feat>
     <!-- Lemma, Full tag (headwords) -->
     <feat>
       <pred>
-        <var name="is_headword" />
+        <macro name="is_headword"></macro>
       </pred>
       <out>
-        <var name="lemma_0" />
+        <macro name="lemma_0"></macro>
       </out>
       <out>
-        <var name="wrd_flattags_0" />
+        <macro name="wrd_flattags_0"></macro>
       </out>
     </feat>
     <!-- Cur headword major tag, major tag (non headwords only only) -->
     <feat>
       <pred>
-        <var name="is_dmorph" />
+        <macro name="is_dmorph"></macro>
       </pred>
       <out>
-        <var name="headword_major_tag_0" />
+        <macro name="headword_major_tag_0"></macro>
       </out>
       <out>
-        <var name="major_tag_0" />
+        <macro name="major_tag_0"></macro>
       </out>
     </feat>
     <!-- Prev headword major tag, cur headword major tag, major tag (non headwords only only) -->
     <feat>
       <pred>
-        <var name="is_dmorph" />
+        <macro name="is_dmorph"></macro>
       </pred>
       <out>
-        <var name="headword_major_tag_m1" />
+        <macro name="headword_major_tag_m1"></macro>
       </out>
       <out>
-        <var name="headword_major_tag_0" />
+        <macro name="headword_major_tag_0"></macro>
       </out>
       <out>
-        <var name="major_tag_0" />
+        <macro name="major_tag_0"></macro>
       </out>
     </feat>
     <!-- Prev headword major tag, major tag (non headwords only only) -->
     <feat>
       <pred>
-        <var name="is_dmorph" />
+        <macro name="is_dmorph"></macro>
       </pred>
       <out>
-        <var name="headword_major_tag_m1" />
+        <macro name="headword_major_tag_m1"></macro>
       </out>
       <out>
-        <var name="major_tag_0" />
+        <macro name="major_tag_0"></macro>
       </out>
     </feat>
     <!-- Prev headword full tag, full tag (non headwords only only) -->
     <feat>
       <pred>
-        <var name="is_dmorph" />
+        <macro name="is_dmorph"></macro>
       </pred>
       <out>
-        <var name="headword_flattags_m1" />
+        <macro name="headword_flattags_m1"></macro>
       </out>
       <out>
-        <var name="wrd_flattags_0" />
+        <macro name="wrd_flattags_0"></macro>
       </out>
     </feat>
   </feats>
Index: branches/apertium-tagger/experiments/mtx/morphodita.mtx
===================================================================
--- branches/apertium-tagger/experiments/mtx/morphodita.mtx	(revision 71686)
+++ branches/apertium-tagger/experiments/mtx/morphodita.mtx	(revision 71687)
@@ -79,7 +79,7 @@
           </ex-wordoids>
           <subscript idx="0">
             <ex-tags>
-              <var name="wordoid">
+              <macro name="wordoid">
             </ex-tags>
           </subscript>
         </for-each>
@@ -96,7 +96,7 @@
           </ex-wordoids>
           <subscript idx="0">
             <ex-tags>
-              <var name="wordoid">
+              <macro name="wordoid">
             </ex-tags>
           </subscript>
         </for-each>
@@ -113,243 +113,243 @@
   <feats>
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Tag -1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="flattags_m1" />
+        <macro name="flattags_0"></macro>
+        <macro name="flattags_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,TagUPos -1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="upos_m1" />
+        <macro name="flattags_0"></macro>
+        <macro name="upos_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Tag -1,Tag -2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="flattags_m1" />
-        <var name="flattags_m2" />
+        <macro name="flattags_0"></macro>
+        <macro name="flattags_m1"></macro>
+        <macro name="flattags_m2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,TagUPos -1,TagUPos -2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="upos_m1" />
-        <var name="upos_m2" />
+        <macro name="flattags_0"></macro>
+        <macro name="upos_m1"></macro>
+        <macro name="upos_m2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Tag -2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="flattags_m2" />
+        <macro name="flattags_0"></macro>
+        <macro name="flattags_m2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form 0,Form -1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_0" />
-        <var name="form_m1" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_0"></macro>
+        <macro name="form_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form -1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_m1" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form -2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_m2" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_m2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form -1,Form -2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_m1" />
-        <var name="form_m2" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_m1"></macro>
+        <macro name="form_m2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form 1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_p1" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_p1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form 1,Form 2\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_p1" />
-        <var name="form_p2" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_p1"></macro>
+        <macro name="form_p2"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Lemma -1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="lemma_m1" />
+        <macro name="flattags_0"></macro>
+        <macro name="lemma_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Form 1\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="form_p1" />
+        <macro name="flattags_0"></macro>
+        <macro name="form_p1"></macro>
       </out>
     </feat>
   <!-- "Lemma 0,Tag -1\n" -->
     <feat>
       <out>
-        <var name="lemma_0" />
-        <var name="flattags_m1" />
+        <macro name="lemma_0"></macro>
+        <macro name="flattags_m1"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix1 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_1_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_1_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix2 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_2_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_2_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix3 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_3_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_3_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix4 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_4_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_4_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix5 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_5_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_5_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix6 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_6_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_6_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix7 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_7_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_7_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix8 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_8_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_8_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Prefix9 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="prefix_9_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="prefix_9_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix1 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_1_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_1_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix2 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_2_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_2_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix3 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_3_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_3_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix4 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_4_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_4_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix5 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_5_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_5_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix6 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_6_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_6_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix7 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_7_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_7_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix8 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_8_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_8_0"></macro>
       </out>
     </feat>
   <!-- "Tag 0,Suffix9 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_9_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_9_0"></macro>
       </out>
     </feat>
   <!-- "TagUPos 0\n" -->
@@ -386,15 +386,15 @@
   <!-- "TagCase 0,Suffix4 0\n" -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_4_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_4_0"></macro>
       </out>
     </feat>
   <!-- "TagCase 0,Suffix5 0\n"; -->
     <feat>
       <out>
-        <var name="flattags_0" />
-        <var name="suffix_5_0" />
+        <macro name="flattags_0"></macro>
+        <macro name="suffix_5_0"></macro>
       </out>
     </feat>
   </feats>
Index: branches/apertium-tagger/experiments/mtx/spacyflattags.mtx
===================================================================
--- branches/apertium-tagger/experiments/mtx/spacyflattags.mtx	(revision 71686)
+++ branches/apertium-tagger/experiments/mtx/spacyflattags.mtx	(revision 71687)
@@ -20,130 +20,130 @@
     <!-- add('bias') # This acts sort of like a prior -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
     </feat>
     <!-- add('i suffix', word[-3:]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="suffix_3_0" />
+        <macro name="suffix_3_0"></macro>
       </out>
     </feat>
     <!-- add('i pref1', word[0]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="suffix_1_0" />
+        <macro name="suffix_1_0"></macro>
       </out>
     </feat>
     <!-- add('i-1 tag', prev) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="flattags_m1" />
+        <macro name="flattags_m1"></macro>
       </out>
     </feat>
     <!-- add('i-2 tag', prev2) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="flattags_m2" />
+        <macro name="flattags_m2"></macro>
       </out>
     </feat>
     <!-- add('i-1 tag+i-2 tag', prev, prev2) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="flattags_m1" />
+        <macro name="flattags_m1"></macro>
       </out>
       <out>
-        <var name="flattags_m2" />
+        <macro name="flattags_m2"></macro>
       </out>
     </feat>
     <!-- add('i word', context[i]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_0" />
+        <macro name="surf_0"></macro>
       </out>
     </feat>
     <!-- add('i-1 tag+i word', prev, context[i]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="flattags_m1" />
+        <macro name="flattags_m1"></macro>
       </out>
       <out>
-        <var name="surf_0" />
+        <macro name="surf_0"></macro>
       </out>
     </feat>
     <!-- add('i-1 word', context[i-1]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_m1" />
+        <macro name="surf_m1"></macro>
       </out>
     </feat>
     <!-- add('i-1 suffix', context[i-1][-3:]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_m1_s3" />
+        <macro name="surf_m1_s3"></macro>
       </out>
     </feat>
     <!-- add('i-2 word', context[i-2]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_m2" />
+        <macro name="surf_m2"></macro>
       </out>
     </feat>
     <!-- add('i+1 word', context[i+1]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_p1" />
+        <macro name="surf_p1"></macro>
       </out>
     </feat>
     <!-- add('i+1 suffix', context[i+1][-3:]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_p1_s3" />
+        <macro name="surf_p1_s3"></macro>
       </out>
     </feat>
     <!-- add('i+2 word', context[i+2]) -->
     <feat>
       <out>
-        <var name="flattags_0" />
+        <macro name="flattags_0"></macro>
       </out>
       <out>
-        <var name="surf_p2" />
+        <macro name="surf_p2"></macro>
       </out>
     </feat>
   </feats>