903 files changed, 113 insertions, 32 deletions
diff --git a/doc/gf3-release.html b/doc/gf3-release.html
new file mode 100644
index 000000000..4f81e8a55
--- /dev/null
+++ b/doc/gf3-release.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+<META NAME="generator" CONTENT="http://txt2tags.sf.net">
+<TITLE>GF 3.0</TITLE>
+</HEAD><BODY BGCOLOR="white" TEXT="black">
+<P ALIGN="center"><CENTER><H1>GF 3.0</H1>
+<FONT SIZE="4">
+<I>Krasimir Angelov, Bj�rn Bringert, and Aarne Ranta</I><BR>
+</FONT></CENTER>
+
+<P>
+GF Version 3.0 is a major revision of GF. The source language is a superset of the
+language in 2.9, which means backward compatibility. But the target languages, the
+compiler implementation, and the functionalities (e.g. the shell) have undergone
+radical changes. 
+</P>
+<P>
+The release of GF 3.0 is projected for 27 June. As usual, the developing sources
+are available all the time via Darcs.
+</P>
+<H2>New features</H2>
+<P>
+Here is a summary of the main novelties visible to the user:
+</P>
+<UL>
+<LI><B>Size</B>: the source code and the executable binary size have gone 
+  down to about the half of 2.9.
+<LI><B>Portability</B>: the new back end format PGF (Portable Grammar Format) is
+  much simpler than the old GFC format, and therefore easier to port to new
+  platforms.
+<LI><B>Multilingual web page support</B>: as an example of portability, GF 3.0 provides a
+  compiler from PGF to JavaScript. There are also JavaScript libraries for creating
+  translators and syntax editors as client-side web applications.
+<LI><B>Incremental parsing</B>: there is a possibility of word completion when
+  input strings are sent to the parser.
+<LI><B>Application programmer's interfaces</B>: both source-GF and PGF formats,
+  the shell, and the compiler are accessible via high-level APIs.
+<LI><B>Resource library version 1.4</B>: more coverage, more languages; some of
+  the new GF language features are exploited.
+</UL>
+
+<H2>Non-supported features</H2>
+<P>
+There are some features of GF 2.9 that will <I>not</I> work in the 2.7 June release.
+</P>
+<UL>
+<LI>Java Editor GUI: we now see the JavaScript editor as the main form of 
+  syntax editing.
+<LI>Pre-module multi-file grammar format: the grammar format of GF before version 2.0 
+  is still supported, but its include mechanism is not; this means that grammars 
+  consisting of multiple files have to be concatenated before use.
+<LI>Probabilistic GF grammars.
+<LI>Some output formats: LBNF.
+<LI>Some GF shell commands: while the main ones will be supported with their familiar
+  syntax and options, some old commands have not been included.
+</UL>
+
+<P>
+Users who want to have these features are welcome to contact us, 
+and even more welcome to contribute code that restores them!
+</P>
+<H2>GF language extensions</H2>
+<P>
+Operations for defining patterns.
+</P>
+<P>
+Inheritance of overload groups.
+</P>
+
+<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -thtml gf3-release.txt -->
+</BODY></HTML>
diff --git a/examples/tutorial/hello/hello.gfs b/examples/tutorial/hello/hello.gfs
index 783919e0e..3a18fee52 100644
--- a/examples/tutorial/hello/hello.gfs
+++ b/examples/tutorial/hello/hello.gfs
@@ -1,4 +1,4 @@
 import HelloEng.gf
 import HelloFin.gf
 import HelloIta.gf
-linearize -multi Hello World
+linearize Hello World
diff --git a/examples/tutorial/semantics/Base.gf b/examples/tutorial/semantics/Base.gf
index 4586c3106..85868d7ac 100644
--- a/examples/tutorial/semantics/Base.gf
+++ b/examples/tutorial/semantics/Base.gf
@@ -30,7 +30,7 @@ fun
 
 -- lexicon
 
-  UseInt  : Int -> PN ;
+  UseInt : Int -> PN ;
 
   Number : CN ;
   Even, Odd, Prime : AP ;
diff --git a/examples/tutorial/semantics/BaseI.gf b/examples/tutorial/semantics/BaseI.gf
index ec967e443..b7ed86666 100644
--- a/examples/tutorial/semantics/BaseI.gf
+++ b/examples/tutorial/semantics/BaseI.gf
@@ -32,7 +32,7 @@ lin
   And = and_Conj ;
   Or  = or_Conj ;
 
-  UseInt i = symb i ;
+  UseInt i = symb (i ** {lock_Int = <>}) ; ---- terrible to need this
 
   Number = mkCN number_N ;
 
@@ -46,15 +46,15 @@ lin
  
   Sum     = prefix sum_N2 ;
   Product = prefix product_N2 ;
-  GCD nps = mkNP (mkDet (mkQuantSg defQuant) (mkOrd great_A)) 
+  GCD nps = mkNP (mkDet DefArt (mkOrd great_A)) 
               (mkCN common_A (mkCN divisor_N2 (mkNP and_Conj nps))) ;
 
   WhatIs np = mkPhr (mkQS (mkQCl whatSg_IP (mkVP np))) ;
-  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP whichPl_IDet cn) (mkVP ap))) ;
+  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP which_IQuant cn) (mkVP ap))) ;
   QuestS s = mkPhr (mkQS (mkQCl s)) ;
 
-  Yes = yes_Phr ;
-  No = no_Phr ;
+  Yes = mkPhr yes_Utt ;
+  No = mkPhr no_Utt ;
 
   Value np = mkPhr (mkUtt np) ;
   Many list = mkNP and_Conj list ;
@@ -65,6 +65,6 @@ lin
 
 oper
   prefix : G.N2 -> G.ListNP -> G.NP = \n2,nps -> 
-    mkNP defSgDet (mkCN n2 (mkNP and_Conj nps)) ;
+    mkNP DefArt (mkCN n2 (mkNP and_Conj nps)) ;
   
 }
diff --git a/examples/tutorial/smart/SmartEng.gf b/examples/tutorial/smart/SmartEng.gf
index 384e50060..eff8a000a 100644
--- a/examples/tutorial/smart/SmartEng.gf
+++ b/examples/tutorial/smart/SmartEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete Toy1Eng of Toy1 = open Prelude in {
+concrete SmartEng of Smart = open Prelude in {
 
 -- grammar Toy1 from the Regulus book
 
diff --git a/examples/tutorial/smart/SmartFre.gf b/examples/tutorial/smart/SmartFre.gf
index c5d903519..95b219b60 100644
--- a/examples/tutorial/smart/SmartFre.gf
+++ b/examples/tutorial/smart/SmartFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete Toy1Fre of Toy1 = open Prelude in {
+concrete SmartFre of Smart = open Prelude in {
 
 -- grammar Toy1 from the Regulus book
 
diff --git a/examples/tutorial/syntax/Syntax.gf b/examples/tutorial/syntax/Syntax.gf
index 31f3fc127..e5b27504d 100644
--- a/examples/tutorial/syntax/Syntax.gf
+++ b/examples/tutorial/syntax/Syntax.gf
@@ -10,17 +10,17 @@ oper
 
   mkS = overload {
     mkS : Pol -> NP -> VP -> S
-       = PredVP ;
+       = \p,np,vp -> UseCl p (PredVP np vp) ;
     mkS : NP -> VP -> S
-       = PredVP PPos ;
+       = \np,vp -> UseCl PPos (PredVP np vp) ;
     mkS : Pol -> NP -> V2 -> NP -> S
-       = \p,np,v,o -> PredVP p np (ComplV2 v o) ;
+       = \p,np,v,o -> UseCl p (PredVP np (ComplV2 v o)) ;
     mkS : NP -> V2 -> NP -> S
-       = \np,v,o -> PredVP PPos np (ComplV2 v o) ;
+       = \np,v,o -> UseCl PPos (PredVP np (ComplV2 v o)) ;
     mkS : Pol -> NP -> AP -> S
-       = \p,np,ap -> PredVP p np (ComplAP ap) ;
+       = \p,np,ap -> UseCl p (PredVP np (ComplAP ap)) ;
     mkS : NP -> AP -> S
-       = \np,ap -> PredVP PPos np (ComplAP ap) ;
+       = \np,ap -> UseCl PPos (PredVP np (ComplAP ap)) ;
     } ;
 
   mkNP : Det -> CN -> NP 
diff --git a/homepage.html b/homepage.html
index 6e392a5a5..69d70d92e 100644
--- a/homepage.html
+++ b/homepage.html
@@ -52,6 +52,14 @@ December 21, 2007.
 
 </p><h2>News</h2>
 
+<i>June 25, 2008</i>.
+<a href="doc/gf3-release.html">GF 3.0</a>
+coming soon! Version 2.9f is now frozen and no longer
+available in darcs. But <a href="download/GF-2.9f.tgz">here</a> is a tarball
+with the final version of 2.9 sources. 
+
+<p>
+
 <i>March 20, 2008</i>. Ten years of GF! 
 <ul>
   <li> <a href="doc/nancy-slides.pdf">The first public talk</a> at INRIA Nancy,
diff --git a/examples/CLE/CF2GF.hs b/old-examples/CLE/CF2GF.hs
index 1bb1d6611..1bb1d6611 100644
--- a/examples/CLE/CF2GF.hs
+++ b/old-examples/CLE/CF2GF.hs
diff --git a/examples/CLE/English.cf b/old-examples/CLE/English.cf
index a267736e1..a267736e1 100644
--- a/examples/CLE/English.cf
+++ b/old-examples/CLE/English.cf
diff --git a/examples/CLE/QLF.gf b/old-examples/CLE/QLF.gf
index 3ebca9e06..3ebca9e06 100644
--- a/examples/CLE/QLF.gf
+++ b/old-examples/CLE/QLF.gf
diff --git a/examples/CLE/QLFEng.gf b/old-examples/CLE/QLFEng.gf
index 192f051b1..192f051b1 100644
--- a/examples/CLE/QLFEng.gf
+++ b/old-examples/CLE/QLFEng.gf
diff --git a/examples/TWA.cf b/old-examples/TWA.cf
index bb23fbd01..bb23fbd01 100644
--- a/examples/TWA.cf
+++ b/old-examples/TWA.cf
diff --git a/examples/animal/Animals.gf b/old-examples/animal/Animals.gf
index 33b56e740..33b56e740 100644
--- a/examples/animal/Animals.gf
+++ b/old-examples/animal/Animals.gf
diff --git a/examples/animal/AnimalsEng.gf b/old-examples/animal/AnimalsEng.gf
index 22942b735..22942b735 100644
--- a/examples/animal/AnimalsEng.gf
+++ b/old-examples/animal/AnimalsEng.gf
diff --git a/examples/animal/AnimalsFre.gf b/old-examples/animal/AnimalsFre.gf
index 198c84ad7..198c84ad7 100644
--- a/examples/animal/AnimalsFre.gf
+++ b/old-examples/animal/AnimalsFre.gf
diff --git a/examples/animal/AnimalsSwe.gf b/old-examples/animal/AnimalsSwe.gf
index 8f256885a..8f256885a 100644
--- a/examples/animal/AnimalsSwe.gf
+++ b/old-examples/animal/AnimalsSwe.gf
diff --git a/examples/animal/Questions.gf b/old-examples/animal/Questions.gf
index bb25e785d..bb25e785d 100644
--- a/examples/animal/Questions.gf
+++ b/old-examples/animal/Questions.gf
diff --git a/examples/animal/QuestionsEng.gf b/old-examples/animal/QuestionsEng.gf
index 8a4c5c406..8a4c5c406 100644
--- a/examples/animal/QuestionsEng.gf
+++ b/old-examples/animal/QuestionsEng.gf
diff --git a/examples/animal/QuestionsFre.gf b/old-examples/animal/QuestionsFre.gf
index dab23b2ba..dab23b2ba 100644
--- a/examples/animal/QuestionsFre.gf
+++ b/old-examples/animal/QuestionsFre.gf
diff --git a/examples/animal/QuestionsI.gf b/old-examples/animal/QuestionsI.gf
index fb4b7a581..fb4b7a581 100644
--- a/examples/animal/QuestionsI.gf
+++ b/old-examples/animal/QuestionsI.gf
diff --git a/examples/animal/QuestionsI.gfe b/old-examples/animal/QuestionsI.gfe
index 70350bf73..70350bf73 100644
--- a/examples/animal/QuestionsI.gfe
+++ b/old-examples/animal/QuestionsI.gfe
diff --git a/examples/animal/QuestionsSwe.gf b/old-examples/animal/QuestionsSwe.gf
index 9d59ecb2e..9d59ecb2e 100644
--- a/examples/animal/QuestionsSwe.gf
+++ b/old-examples/animal/QuestionsSwe.gf
diff --git a/examples/animal/mkAnimals.gfs b/old-examples/animal/mkAnimals.gfs
index 304263eb9..304263eb9 100644
--- a/examples/animal/mkAnimals.gfs
+++ b/old-examples/animal/mkAnimals.gfs
diff --git a/examples/big/BigEnglish.gf b/old-examples/big/BigEnglish.gf
index f7cfe9cf6..f7cfe9cf6 100644
--- a/examples/big/BigEnglish.gf
+++ b/old-examples/big/BigEnglish.gf
diff --git a/examples/big/BigEnglishAbs.gf b/old-examples/big/BigEnglishAbs.gf
index 28ea2759c..28ea2759c 100644
--- a/examples/big/BigEnglishAbs.gf
+++ b/old-examples/big/BigEnglishAbs.gf
diff --git a/examples/big/BigLexEng.gf b/old-examples/big/BigLexEng.gf
index a477c9172..a477c9172 100644
--- a/examples/big/BigLexEng.gf
+++ b/old-examples/big/BigLexEng.gf
diff --git a/examples/big/BigLexEngAbs.gf b/old-examples/big/BigLexEngAbs.gf
index dae14482b..dae14482b 100644
--- a/examples/big/BigLexEngAbs.gf
+++ b/old-examples/big/BigLexEngAbs.gf
diff --git a/examples/big/BigLexSwe.gf b/old-examples/big/BigLexSwe.gf
index c17907470..c17907470 100644
--- a/examples/big/BigLexSwe.gf
+++ b/old-examples/big/BigLexSwe.gf
diff --git a/examples/big/BigLexSweAbs.gf b/old-examples/big/BigLexSweAbs.gf
index 75d6bdb03..75d6bdb03 100644
--- a/examples/big/BigLexSweAbs.gf
+++ b/old-examples/big/BigLexSweAbs.gf
diff --git a/examples/big/BigSwedish.gf b/old-examples/big/BigSwedish.gf
index 552d5c4f7..552d5c4f7 100644
--- a/examples/big/BigSwedish.gf
+++ b/old-examples/big/BigSwedish.gf
diff --git a/examples/big/BigSwedishAbs.gf b/old-examples/big/BigSwedishAbs.gf
index 9c4ca20c5..9c4ca20c5 100644
--- a/examples/big/BigSwedishAbs.gf
+++ b/old-examples/big/BigSwedishAbs.gf
diff --git a/examples/big/MAP/Lisp.cf b/old-examples/big/MAP/Lisp.cf
index e0fd0de88..e0fd0de88 100644
--- a/examples/big/MAP/Lisp.cf
+++ b/old-examples/big/MAP/Lisp.cf
diff --git a/examples/big/MAP/Makefile b/old-examples/big/MAP/Makefile
index 8586995a3..8586995a3 100644
--- a/examples/big/MAP/Makefile
+++ b/old-examples/big/MAP/Makefile
diff --git a/examples/big/MAP/MkBig.hs b/old-examples/big/MAP/MkBig.hs
index 0ea4e0b18..0ea4e0b18 100644
--- a/examples/big/MAP/MkBig.hs
+++ b/old-examples/big/MAP/MkBig.hs
diff --git a/examples/big/MAP/TransBig.hs b/old-examples/big/MAP/TransBig.hs
index ea59dcc6c..ea59dcc6c 100644
--- a/examples/big/MAP/TransBig.hs
+++ b/old-examples/big/MAP/TransBig.hs
diff --git a/examples/big/MAP/bigwordlist.en b/old-examples/big/MAP/bigwordlist.en
index a233d4e86..a233d4e86 100644
--- a/examples/big/MAP/bigwordlist.en
+++ b/old-examples/big/MAP/bigwordlist.en
diff --git a/examples/big/MAP/log.txt b/old-examples/big/MAP/log.txt
index 4b66f9595..4b66f9595 100644
--- a/examples/big/MAP/log.txt
+++ b/old-examples/big/MAP/log.txt
diff --git a/examples/big/MkDict.hs b/old-examples/big/MkDict.hs
index babf7809f..babf7809f 100644
--- a/examples/big/MkDict.hs
+++ b/old-examples/big/MkDict.hs
diff --git a/examples/big/MoreParadigmsSwe.gf b/old-examples/big/MoreParadigmsSwe.gf
index 1fccfb4b5..1fccfb4b5 100644
--- a/examples/big/MoreParadigmsSwe.gf
+++ b/old-examples/big/MoreParadigmsSwe.gf
diff --git a/examples/big/README b/old-examples/big/README
index 20a064be9..20a064be9 100644
--- a/examples/big/README
+++ b/old-examples/big/README
diff --git a/examples/big/extract2gf.hs b/old-examples/big/extract2gf.hs
index 6fbc1f5da..6fbc1f5da 100644
--- a/examples/big/extract2gf.hs
+++ b/old-examples/big/extract2gf.hs
diff --git a/examples/big/mywordlist1 b/old-examples/big/mywordlist1
index 99572fe30..99572fe30 100644
--- a/examples/big/mywordlist1
+++ b/old-examples/big/mywordlist1
diff --git a/examples/big/postedit.hs b/old-examples/big/postedit.hs
index 628b64752..628b64752 100644
--- a/examples/big/postedit.hs
+++ b/old-examples/big/postedit.hs
diff --git a/examples/bronzeage/Bronzeage.gf b/old-examples/bronzeage/Bronzeage.gf
index 0e8dc8656..0e8dc8656 100644
--- a/examples/bronzeage/Bronzeage.gf
+++ b/old-examples/bronzeage/Bronzeage.gf
diff --git a/examples/bronzeage/BronzeageAra.gf b/old-examples/bronzeage/BronzeageAra.gf
index dcf35e5f4..dcf35e5f4 100644
--- a/examples/bronzeage/BronzeageAra.gf
+++ b/old-examples/bronzeage/BronzeageAra.gf
diff --git a/examples/bronzeage/BronzeageDan.gf b/old-examples/bronzeage/BronzeageDan.gf
index e8328e721..e8328e721 100644
--- a/examples/bronzeage/BronzeageDan.gf
+++ b/old-examples/bronzeage/BronzeageDan.gf
diff --git a/examples/bronzeage/BronzeageEng.gf b/old-examples/bronzeage/BronzeageEng.gf
index 04ff53a3c..04ff53a3c 100644
--- a/examples/bronzeage/BronzeageEng.gf
+++ b/old-examples/bronzeage/BronzeageEng.gf
diff --git a/examples/bronzeage/BronzeageFin.gf b/old-examples/bronzeage/BronzeageFin.gf
index cc5940d4e..cc5940d4e 100644
--- a/examples/bronzeage/BronzeageFin.gf
+++ b/old-examples/bronzeage/BronzeageFin.gf
diff --git a/examples/bronzeage/BronzeageFre.gf b/old-examples/bronzeage/BronzeageFre.gf
index 63231a652..63231a652 100644
--- a/examples/bronzeage/BronzeageFre.gf
+++ b/old-examples/bronzeage/BronzeageFre.gf
diff --git a/examples/bronzeage/BronzeageGer.gf b/old-examples/bronzeage/BronzeageGer.gf
index dec77d187..dec77d187 100644
--- a/examples/bronzeage/BronzeageGer.gf
+++ b/old-examples/bronzeage/BronzeageGer.gf
diff --git a/examples/bronzeage/BronzeageI.gf b/old-examples/bronzeage/BronzeageI.gf
index 23693dc6f..23693dc6f 100644
--- a/examples/bronzeage/BronzeageI.gf
+++ b/old-examples/bronzeage/BronzeageI.gf
diff --git a/examples/bronzeage/BronzeageIta.gf b/old-examples/bronzeage/BronzeageIta.gf
index 54ba559a6..54ba559a6 100644
--- a/examples/bronzeage/BronzeageIta.gf
+++ b/old-examples/bronzeage/BronzeageIta.gf
diff --git a/examples/bronzeage/BronzeageNor.gf b/old-examples/bronzeage/BronzeageNor.gf
index 75b469cee..75b469cee 100644
--- a/examples/bronzeage/BronzeageNor.gf
+++ b/old-examples/bronzeage/BronzeageNor.gf
diff --git a/examples/bronzeage/BronzeageRus.gf b/old-examples/bronzeage/BronzeageRus.gf
index 916c78e38..916c78e38 100644
--- a/examples/bronzeage/BronzeageRus.gf
+++ b/old-examples/bronzeage/BronzeageRus.gf
diff --git a/examples/bronzeage/BronzeageSpa.gf b/old-examples/bronzeage/BronzeageSpa.gf
index db10f2885..db10f2885 100644
--- a/examples/bronzeage/BronzeageSpa.gf
+++ b/old-examples/bronzeage/BronzeageSpa.gf
diff --git a/examples/bronzeage/BronzeageSwe.gf b/old-examples/bronzeage/BronzeageSwe.gf
index 24a4cf759..24a4cf759 100644
--- a/examples/bronzeage/BronzeageSwe.gf
+++ b/old-examples/bronzeage/BronzeageSwe.gf
diff --git a/examples/bronzeage/README b/old-examples/bronzeage/README
index 9275d1e09..9275d1e09 100644
--- a/examples/bronzeage/README
+++ b/old-examples/bronzeage/README
diff --git a/examples/bronzeage/Swadesh.gf b/old-examples/bronzeage/Swadesh.gf
index 98402b801..98402b801 100644
--- a/examples/bronzeage/Swadesh.gf
+++ b/old-examples/bronzeage/Swadesh.gf
diff --git a/examples/bronzeage/SwadeshAra.gf b/old-examples/bronzeage/SwadeshAra.gf
index cfe54d1b2..cfe54d1b2 100644
--- a/examples/bronzeage/SwadeshAra.gf
+++ b/old-examples/bronzeage/SwadeshAra.gf
diff --git a/examples/bronzeage/SwadeshDan.gf b/old-examples/bronzeage/SwadeshDan.gf
index e667609f3..e667609f3 100644
--- a/examples/bronzeage/SwadeshDan.gf
+++ b/old-examples/bronzeage/SwadeshDan.gf
diff --git a/examples/bronzeage/SwadeshEng.gf b/old-examples/bronzeage/SwadeshEng.gf
index 5b10141c5..5b10141c5 100644
--- a/examples/bronzeage/SwadeshEng.gf
+++ b/old-examples/bronzeage/SwadeshEng.gf
diff --git a/examples/bronzeage/SwadeshFin.gf b/old-examples/bronzeage/SwadeshFin.gf
index 191874c05..191874c05 100644
--- a/examples/bronzeage/SwadeshFin.gf
+++ b/old-examples/bronzeage/SwadeshFin.gf
diff --git a/examples/bronzeage/SwadeshFre.gf b/old-examples/bronzeage/SwadeshFre.gf
index bffe9e36e..bffe9e36e 100644
--- a/examples/bronzeage/SwadeshFre.gf
+++ b/old-examples/bronzeage/SwadeshFre.gf
diff --git a/examples/bronzeage/SwadeshGer.gf b/old-examples/bronzeage/SwadeshGer.gf
index 096d3496c..096d3496c 100644
--- a/examples/bronzeage/SwadeshGer.gf
+++ b/old-examples/bronzeage/SwadeshGer.gf
diff --git a/examples/bronzeage/SwadeshI.gf b/old-examples/bronzeage/SwadeshI.gf
index 0cd3fcd32..0cd3fcd32 100644
--- a/examples/bronzeage/SwadeshI.gf
+++ b/old-examples/bronzeage/SwadeshI.gf
diff --git a/examples/bronzeage/SwadeshIta.gf b/old-examples/bronzeage/SwadeshIta.gf
index b84295867..b84295867 100644
--- a/examples/bronzeage/SwadeshIta.gf
+++ b/old-examples/bronzeage/SwadeshIta.gf
diff --git a/examples/bronzeage/SwadeshNor.gf b/old-examples/bronzeage/SwadeshNor.gf
index 5d392462d..5d392462d 100644
--- a/examples/bronzeage/SwadeshNor.gf
+++ b/old-examples/bronzeage/SwadeshNor.gf
diff --git a/examples/bronzeage/SwadeshRus.gf b/old-examples/bronzeage/SwadeshRus.gf
index 263819f07..263819f07 100644
--- a/examples/bronzeage/SwadeshRus.gf
+++ b/old-examples/bronzeage/SwadeshRus.gf
diff --git a/examples/bronzeage/SwadeshSpa.gf b/old-examples/bronzeage/SwadeshSpa.gf
index 48de83341..48de83341 100644
--- a/examples/bronzeage/SwadeshSpa.gf
+++ b/old-examples/bronzeage/SwadeshSpa.gf
diff --git a/examples/bronzeage/SwadeshSwe.gf b/old-examples/bronzeage/SwadeshSwe.gf
index 2a82b2bc4..2a82b2bc4 100644
--- a/examples/bronzeage/SwadeshSwe.gf
+++ b/old-examples/bronzeage/SwadeshSwe.gf
diff --git a/examples/bronzeage/old/SwadeshEng.gf b/old-examples/bronzeage/old/SwadeshEng.gf
index b79111b11..b79111b11 100644
--- a/examples/bronzeage/old/SwadeshEng.gf
+++ b/old-examples/bronzeage/old/SwadeshEng.gf
diff --git a/examples/bronzeage/old/SwadeshFin.gf b/old-examples/bronzeage/old/SwadeshFin.gf
index 4f73c5a09..4f73c5a09 100644
--- a/examples/bronzeage/old/SwadeshFin.gf
+++ b/old-examples/bronzeage/old/SwadeshFin.gf
diff --git a/examples/bronzeage/old/SwadeshFre.gf b/old-examples/bronzeage/old/SwadeshFre.gf
index a7c326ca4..a7c326ca4 100644
--- a/examples/bronzeage/old/SwadeshFre.gf
+++ b/old-examples/bronzeage/old/SwadeshFre.gf
diff --git a/examples/bronzeage/old/SwadeshGer.gf b/old-examples/bronzeage/old/SwadeshGer.gf
index 85c057bb0..85c057bb0 100644
--- a/examples/bronzeage/old/SwadeshGer.gf
+++ b/old-examples/bronzeage/old/SwadeshGer.gf
diff --git a/examples/bronzeage/old/SwadeshIta.gf b/old-examples/bronzeage/old/SwadeshIta.gf
index 7d55f2a99..7d55f2a99 100644
--- a/examples/bronzeage/old/SwadeshIta.gf
+++ b/old-examples/bronzeage/old/SwadeshIta.gf
diff --git a/examples/bronzeage/old/SwadeshNor.gf b/old-examples/bronzeage/old/SwadeshNor.gf
index 48d8a4db8..48d8a4db8 100644
--- a/examples/bronzeage/old/SwadeshNor.gf
+++ b/old-examples/bronzeage/old/SwadeshNor.gf
diff --git a/examples/bronzeage/old/SwadeshRus.gf b/old-examples/bronzeage/old/SwadeshRus.gf
index 651b0b0fa..651b0b0fa 100644
--- a/examples/bronzeage/old/SwadeshRus.gf
+++ b/old-examples/bronzeage/old/SwadeshRus.gf
diff --git a/examples/bronzeage/old/SwadeshSpa.gf b/old-examples/bronzeage/old/SwadeshSpa.gf
index c7ef810df..c7ef810df 100644
--- a/examples/bronzeage/old/SwadeshSpa.gf
+++ b/old-examples/bronzeage/old/SwadeshSpa.gf
diff --git a/examples/bronzeage/old/SwadeshSwe.gf b/old-examples/bronzeage/old/SwadeshSwe.gf
index be548b07f..be548b07f 100644
--- a/examples/bronzeage/old/SwadeshSwe.gf
+++ b/old-examples/bronzeage/old/SwadeshSwe.gf
diff --git a/examples/compiling/Compex.gf b/old-examples/compiling/Compex.gf
index 06327c789..06327c789 100644
--- a/examples/compiling/Compex.gf
+++ b/old-examples/compiling/Compex.gf
diff --git a/examples/compiling/CompexEng.gf b/old-examples/compiling/CompexEng.gf
index 10b0babdc..10b0babdc 100644
--- a/examples/compiling/CompexEng.gf
+++ b/old-examples/compiling/CompexEng.gf
diff --git a/examples/dialogue/Agenda.gf b/old-examples/dialogue/Agenda.gf
index 970f7bc55..970f7bc55 100644
--- a/examples/dialogue/Agenda.gf
+++ b/old-examples/dialogue/Agenda.gf
diff --git a/examples/dialogue/AgendaEng.gf b/old-examples/dialogue/AgendaEng.gf
index 658853004..658853004 100644
--- a/examples/dialogue/AgendaEng.gf
+++ b/old-examples/dialogue/AgendaEng.gf
diff --git a/examples/dialogue/AgendaFin.gf b/old-examples/dialogue/AgendaFin.gf
index 67074acad..67074acad 100644
--- a/examples/dialogue/AgendaFin.gf
+++ b/old-examples/dialogue/AgendaFin.gf
diff --git a/examples/dialogue/AgendaFre.gf b/old-examples/dialogue/AgendaFre.gf
index e435e0428..e435e0428 100644
--- a/examples/dialogue/AgendaFre.gf
+++ b/old-examples/dialogue/AgendaFre.gf
diff --git a/examples/dialogue/AgendaProlog.gf b/old-examples/dialogue/AgendaProlog.gf
index 0bdc4aebf..0bdc4aebf 100644
--- a/examples/dialogue/AgendaProlog.gf
+++ b/old-examples/dialogue/AgendaProlog.gf
diff --git a/examples/dialogue/AgendaSwe.gf b/old-examples/dialogue/AgendaSwe.gf
index a9331e9a0..a9331e9a0 100644
--- a/examples/dialogue/AgendaSwe.gf
+++ b/old-examples/dialogue/AgendaSwe.gf
diff --git a/examples/dialogue/AuxDialogue.gf b/old-examples/dialogue/AuxDialogue.gf
index ee1313d9b..ee1313d9b 100644
--- a/examples/dialogue/AuxDialogue.gf
+++ b/old-examples/dialogue/AuxDialogue.gf
diff --git a/examples/dialogue/AuxEng.gf b/old-examples/dialogue/AuxEng.gf
index 89f2ec57e..89f2ec57e 100644
--- a/examples/dialogue/AuxEng.gf
+++ b/old-examples/dialogue/AuxEng.gf
diff --git a/examples/dialogue/AuxFin.gf b/old-examples/dialogue/AuxFin.gf
index cb72b447c..cb72b447c 100644
--- a/examples/dialogue/AuxFin.gf
+++ b/old-examples/dialogue/AuxFin.gf
diff --git a/examples/dialogue/AuxFre.gf b/old-examples/dialogue/AuxFre.gf
index b663e3650..b663e3650 100644
--- a/examples/dialogue/AuxFre.gf
+++ b/old-examples/dialogue/AuxFre.gf
diff --git a/examples/dialogue/AuxSwe.gf b/old-examples/dialogue/AuxSwe.gf
index acd7907b0..acd7907b0 100644
--- a/examples/dialogue/AuxSwe.gf
+++ b/old-examples/dialogue/AuxSwe.gf
diff --git a/examples/dialogue/Dialogue.gf b/old-examples/dialogue/Dialogue.gf
index 41f805c93..41f805c93 100644
--- a/examples/dialogue/Dialogue.gf
+++ b/old-examples/dialogue/Dialogue.gf
diff --git a/examples/dialogue/DialogueEng.gf b/old-examples/dialogue/DialogueEng.gf
index 9f75525fe..9f75525fe 100644
--- a/examples/dialogue/DialogueEng.gf
+++ b/old-examples/dialogue/DialogueEng.gf
diff --git a/examples/dialogue/DialogueFin.gf b/old-examples/dialogue/DialogueFin.gf
index 9ef44d02c..9ef44d02c 100644
--- a/examples/dialogue/DialogueFin.gf
+++ b/old-examples/dialogue/DialogueFin.gf
diff --git a/examples/dialogue/DialogueFre.gf b/old-examples/dialogue/DialogueFre.gf
index 9fc908dee..9fc908dee 100644
--- a/examples/dialogue/DialogueFre.gf
+++ b/old-examples/dialogue/DialogueFre.gf
diff --git a/examples/dialogue/DialogueI.gf b/old-examples/dialogue/DialogueI.gf
index 7dc30a74a..7dc30a74a 100644
--- a/examples/dialogue/DialogueI.gf
+++ b/old-examples/dialogue/DialogueI.gf
diff --git a/examples/dialogue/DialogueProlog.gf b/old-examples/dialogue/DialogueProlog.gf
index 6398ee6f3..6398ee6f3 100644
--- a/examples/dialogue/DialogueProlog.gf
+++ b/old-examples/dialogue/DialogueProlog.gf
diff --git a/examples/dialogue/DialogueSwe.gf b/old-examples/dialogue/DialogueSwe.gf
index b23d761bc..b23d761bc 100644
--- a/examples/dialogue/DialogueSwe.gf
+++ b/old-examples/dialogue/DialogueSwe.gf
diff --git a/examples/dialogue/Lights.gf b/old-examples/dialogue/Lights.gf
index ef0f48449..ef0f48449 100644
--- a/examples/dialogue/Lights.gf
+++ b/old-examples/dialogue/Lights.gf
diff --git a/examples/dialogue/LightsEng.gf b/old-examples/dialogue/LightsEng.gf
index dfed6de85..dfed6de85 100644
--- a/examples/dialogue/LightsEng.gf
+++ b/old-examples/dialogue/LightsEng.gf
diff --git a/examples/dialogue/LightsFin.gf b/old-examples/dialogue/LightsFin.gf
index 75c46ff49..75c46ff49 100644
--- a/examples/dialogue/LightsFin.gf
+++ b/old-examples/dialogue/LightsFin.gf
diff --git a/examples/dialogue/LightsFre.gf b/old-examples/dialogue/LightsFre.gf
index 77316e5a1..77316e5a1 100644
--- a/examples/dialogue/LightsFre.gf
+++ b/old-examples/dialogue/LightsFre.gf
diff --git a/examples/dialogue/LightsProlog.gf b/old-examples/dialogue/LightsProlog.gf
index 42b4b3e2b..42b4b3e2b 100644
--- a/examples/dialogue/LightsProlog.gf
+++ b/old-examples/dialogue/LightsProlog.gf
diff --git a/examples/dialogue/LightsSwe.gf b/old-examples/dialogue/LightsSwe.gf
index 19f0d8964..19f0d8964 100644
--- a/examples/dialogue/LightsSwe.gf
+++ b/old-examples/dialogue/LightsSwe.gf
diff --git a/examples/dialogue/Makefile b/old-examples/dialogue/Makefile
index 475736740..475736740 100644
--- a/examples/dialogue/Makefile
+++ b/old-examples/dialogue/Makefile
diff --git a/examples/dialogue/README.txt b/old-examples/dialogue/README.txt
index db14dad96..db14dad96 100644
--- a/examples/dialogue/README.txt
+++ b/old-examples/dialogue/README.txt
diff --git a/examples/dialogue/ResProlog.gf b/old-examples/dialogue/ResProlog.gf
index ce3bbce4b..ce3bbce4b 100644
--- a/examples/dialogue/ResProlog.gf
+++ b/old-examples/dialogue/ResProlog.gf
diff --git a/examples/dialogue/Weekday.gf b/old-examples/dialogue/Weekday.gf
index 8ef2e8c99..8ef2e8c99 100644
--- a/examples/dialogue/Weekday.gf
+++ b/old-examples/dialogue/Weekday.gf
diff --git a/examples/dialogue/WeekdayEng.gf b/old-examples/dialogue/WeekdayEng.gf
index 7d296af9a..7d296af9a 100644
--- a/examples/dialogue/WeekdayEng.gf
+++ b/old-examples/dialogue/WeekdayEng.gf
diff --git a/examples/dialogue/WeekdayFin.gf b/old-examples/dialogue/WeekdayFin.gf
index b150c2872..b150c2872 100644
--- a/examples/dialogue/WeekdayFin.gf
+++ b/old-examples/dialogue/WeekdayFin.gf
diff --git a/examples/dialogue/WeekdayFre.gf b/old-examples/dialogue/WeekdayFre.gf
index d0c6e141a..d0c6e141a 100644
--- a/examples/dialogue/WeekdayFre.gf
+++ b/old-examples/dialogue/WeekdayFre.gf
diff --git a/examples/dialogue/WeekdayProlog.gf b/old-examples/dialogue/WeekdayProlog.gf
index 384484cce..384484cce 100644
--- a/examples/dialogue/WeekdayProlog.gf
+++ b/old-examples/dialogue/WeekdayProlog.gf
diff --git a/examples/dialogue/WeekdaySwe.gf b/old-examples/dialogue/WeekdaySwe.gf
index 2cd55c522..2cd55c522 100644
--- a/examples/dialogue/WeekdaySwe.gf
+++ b/old-examples/dialogue/WeekdaySwe.gf
diff --git a/examples/dialogue/gf-dialogue.html b/old-examples/dialogue/gf-dialogue.html
index 19b5317a0..19b5317a0 100644
--- a/examples/dialogue/gf-dialogue.html
+++ b/old-examples/dialogue/gf-dialogue.html
diff --git a/examples/disamb/Conversation.gf b/old-examples/disamb/Conversation.gf
index fbbfccc0c..fbbfccc0c 100644
--- a/examples/disamb/Conversation.gf
+++ b/old-examples/disamb/Conversation.gf
diff --git a/examples/disamb/ConversationEng.gf b/old-examples/disamb/ConversationEng.gf
index 127ec54bd..127ec54bd 100644
--- a/examples/disamb/ConversationEng.gf
+++ b/old-examples/disamb/ConversationEng.gf
diff --git a/examples/disamb/ConversationIta.gf b/old-examples/disamb/ConversationIta.gf
index 6728a38b0..6728a38b0 100644
--- a/examples/disamb/ConversationIta.gf
+++ b/old-examples/disamb/ConversationIta.gf
diff --git a/examples/features/Param.gf b/old-examples/features/Param.gf
index 15b0cd8b7..15b0cd8b7 100644
--- a/examples/features/Param.gf
+++ b/old-examples/features/Param.gf
diff --git a/examples/gfcc/Imper.gf b/old-examples/gfcc/Imper.gf
index ff0e133ee..ff0e133ee 100644
--- a/examples/gfcc/Imper.gf
+++ b/old-examples/gfcc/Imper.gf
diff --git a/examples/gfcc/ImperC.gf b/old-examples/gfcc/ImperC.gf
index 57f9d9f9e..57f9d9f9e 100644
--- a/examples/gfcc/ImperC.gf
+++ b/old-examples/gfcc/ImperC.gf
diff --git a/examples/gfcc/ImperEng.gf b/old-examples/gfcc/ImperEng.gf
index 6a2a10e7c..6a2a10e7c 100644
--- a/examples/gfcc/ImperEng.gf
+++ b/old-examples/gfcc/ImperEng.gf
diff --git a/examples/gfcc/ImperJVM.gf b/old-examples/gfcc/ImperJVM.gf
index d5d390727..d5d390727 100644
--- a/examples/gfcc/ImperJVM.gf
+++ b/old-examples/gfcc/ImperJVM.gf
diff --git a/examples/gfcc/JVM.hs b/old-examples/gfcc/JVM.hs
index 380570049..380570049 100644
--- a/examples/gfcc/JVM.hs
+++ b/old-examples/gfcc/JVM.hs
diff --git a/examples/gfcc/ResImper.gf b/old-examples/gfcc/ResImper.gf
index 57cdf9434..57cdf9434 100644
--- a/examples/gfcc/ResImper.gf
+++ b/old-examples/gfcc/ResImper.gf
diff --git a/examples/gfcc/ResImperEng.gf b/old-examples/gfcc/ResImperEng.gf
index 87cb30a54..87cb30a54 100644
--- a/examples/gfcc/ResImperEng.gf
+++ b/old-examples/gfcc/ResImperEng.gf
diff --git a/examples/gfcc/compiler/CleanJVM.hs b/old-examples/gfcc/compiler/CleanJVM.hs
index ab879ff0e..ab879ff0e 100644
--- a/examples/gfcc/compiler/CleanJVM.hs
+++ b/old-examples/gfcc/compiler/CleanJVM.hs
diff --git a/examples/gfcc/compiler/ErrM.hs b/old-examples/gfcc/compiler/ErrM.hs
index 85c311a88..85c311a88 100644
--- a/examples/gfcc/compiler/ErrM.hs
+++ b/old-examples/gfcc/compiler/ErrM.hs
diff --git a/examples/gfcc/compiler/FILES b/old-examples/gfcc/compiler/FILES
index 8b1d89a90..8b1d89a90 100644
--- a/examples/gfcc/compiler/FILES
+++ b/old-examples/gfcc/compiler/FILES
diff --git a/examples/gfcc/compiler/LexImperC.hs b/old-examples/gfcc/compiler/LexImperC.hs
index ceec89d25..ceec89d25 100644
--- a/examples/gfcc/compiler/LexImperC.hs
+++ b/old-examples/gfcc/compiler/LexImperC.hs
diff --git a/examples/gfcc/compiler/ParImperC.hs b/old-examples/gfcc/compiler/ParImperC.hs
index afa46955c..afa46955c 100644
--- a/examples/gfcc/compiler/ParImperC.hs
+++ b/old-examples/gfcc/compiler/ParImperC.hs
diff --git a/examples/gfcc/compiler/Profile.hs b/old-examples/gfcc/compiler/Profile.hs
index 0c549cd67..0c549cd67 100644
--- a/examples/gfcc/compiler/Profile.hs
+++ b/old-examples/gfcc/compiler/Profile.hs
diff --git a/examples/gfcc/compiler/README b/old-examples/gfcc/compiler/README
index 862317d8c..862317d8c 100644
--- a/examples/gfcc/compiler/README
+++ b/old-examples/gfcc/compiler/README
diff --git a/examples/gfcc/compiler/TestImperC.hs b/old-examples/gfcc/compiler/TestImperC.hs
index a32777a5d..a32777a5d 100644
--- a/examples/gfcc/compiler/TestImperC.hs
+++ b/old-examples/gfcc/compiler/TestImperC.hs
diff --git a/examples/gfcc/compiler/Trees.hs b/old-examples/gfcc/compiler/Trees.hs
index 57fbfd966..57fbfd966 100644
--- a/examples/gfcc/compiler/Trees.hs
+++ b/old-examples/gfcc/compiler/Trees.hs
diff --git a/examples/gfcc/compiler/abs.c b/old-examples/gfcc/compiler/abs.c
index 947711c13..947711c13 100644
--- a/examples/gfcc/compiler/abs.c
+++ b/old-examples/gfcc/compiler/abs.c
diff --git a/examples/gfcc/compiler/demo.c b/old-examples/gfcc/compiler/demo.c
index d9a95d2b6..d9a95d2b6 100644
--- a/examples/gfcc/compiler/demo.c
+++ b/old-examples/gfcc/compiler/demo.c
diff --git a/examples/gfcc/compiler/demo.gif b/old-examples/gfcc/compiler/demo.gif
index 798c09170..798c09170 100644
--- a/examples/gfcc/compiler/demo.gif
+++ b/old-examples/gfcc/compiler/demo.gif
diff --git a/examples/gfcc/compiler/factorial.c b/old-examples/gfcc/compiler/factorial.c
index 76fee32d0..76fee32d0 100644
--- a/examples/gfcc/compiler/factorial.c
+++ b/old-examples/gfcc/compiler/factorial.c
diff --git a/examples/gfcc/compiler/fibonacci.c b/old-examples/gfcc/compiler/fibonacci.c
index 80e8a0d5c..80e8a0d5c 100644
--- a/examples/gfcc/compiler/fibonacci.c
+++ b/old-examples/gfcc/compiler/fibonacci.c
diff --git a/examples/gfcc/compiler/gfcc b/old-examples/gfcc/compiler/gfcc
index 5be0e4094..5be0e4094 100644
--- a/examples/gfcc/compiler/gfcc
+++ b/old-examples/gfcc/compiler/gfcc
diff --git a/examples/gfcc/compiler/makefile b/old-examples/gfcc/compiler/makefile
index c23fcc48d..c23fcc48d 100644
--- a/examples/gfcc/compiler/makefile
+++ b/old-examples/gfcc/compiler/makefile
diff --git a/examples/gfcc/compiler/runtime.j b/old-examples/gfcc/compiler/runtime.j
index 88db0b9b8..88db0b9b8 100644
--- a/examples/gfcc/compiler/runtime.j
+++ b/old-examples/gfcc/compiler/runtime.j
diff --git a/examples/gfcc/compiler/typecheck.gfs b/old-examples/gfcc/compiler/typecheck.gfs
index 815108ddc..815108ddc 100644
--- a/examples/gfcc/compiler/typecheck.gfs
+++ b/old-examples/gfcc/compiler/typecheck.gfs
diff --git a/examples/gfcc/complin.tex b/old-examples/gfcc/complin.tex
index f2803a6fe..f2803a6fe 100644
--- a/examples/gfcc/complin.tex
+++ b/old-examples/gfcc/complin.tex
diff --git a/examples/gfcc/demo2.ps b/old-examples/gfcc/demo2.ps
index c1e353d15..c1e353d15 100644
--- a/examples/gfcc/demo2.ps
+++ b/old-examples/gfcc/demo2.ps
diff --git a/examples/gfcc/even.c b/old-examples/gfcc/even.c
index bb88e32bd..bb88e32bd 100644
--- a/examples/gfcc/even.c
+++ b/old-examples/gfcc/even.c
diff --git a/examples/index.html b/old-examples/index.html
index 693727bcb..693727bcb 100644
--- a/examples/index.html
+++ b/old-examples/index.html
diff --git a/examples/index.txt b/old-examples/index.txt
index 74632502d..74632502d 100644
--- a/examples/index.txt
+++ b/old-examples/index.txt
diff --git a/examples/letter/Letter.gfcm b/old-examples/letter/Letter.gfcm
index 849461cb2..849461cb2 100644
--- a/examples/letter/Letter.gfcm
+++ b/old-examples/letter/Letter.gfcm
diff --git a/examples/letter/README b/old-examples/letter/README
index 936fab377..936fab377 100644
--- a/examples/letter/README
+++ b/old-examples/letter/README
diff --git a/examples/letter/letter.Abs.gf b/old-examples/letter/letter.Abs.gf
index 48be93a33..48be93a33 100644
--- a/examples/letter/letter.Abs.gf
+++ b/old-examples/letter/letter.Abs.gf
diff --git a/examples/letter/letter.Eng.gf b/old-examples/letter/letter.Eng.gf
index 561917551..561917551 100644
--- a/examples/letter/letter.Eng.gf
+++ b/old-examples/letter/letter.Eng.gf
diff --git a/examples/letter/letter.Fin.gf b/old-examples/letter/letter.Fin.gf
index afebeef69..afebeef69 100644
--- a/examples/letter/letter.Fin.gf
+++ b/old-examples/letter/letter.Fin.gf
diff --git a/examples/letter/letter.Fra.gf b/old-examples/letter/letter.Fra.gf
index afbb6db4e..afbb6db4e 100644
--- a/examples/letter/letter.Fra.gf
+++ b/old-examples/letter/letter.Fra.gf
diff --git a/examples/letter/letter.HebU.gf b/old-examples/letter/letter.HebU.gf
index f69fac703..f69fac703 100644
--- a/examples/letter/letter.HebU.gf
+++ b/old-examples/letter/letter.HebU.gf
diff --git a/examples/letter/letter.RusU.gf b/old-examples/letter/letter.RusU.gf
index 1ed5f4404..1ed5f4404 100644
--- a/examples/letter/letter.RusU.gf
+++ b/old-examples/letter/letter.RusU.gf
diff --git a/examples/letter/letter.Sve.gf b/old-examples/letter/letter.Sve.gf
index 00d5439ef..00d5439ef 100644
--- a/examples/letter/letter.Sve.gf
+++ b/old-examples/letter/letter.Sve.gf
diff --git a/examples/letter/mkLetter.gfs b/old-examples/letter/mkLetter.gfs
index 61da928d7..61da928d7 100644
--- a/examples/letter/mkLetter.gfs
+++ b/old-examples/letter/mkLetter.gfs
diff --git a/examples/logic/Arithm.gf b/old-examples/logic/Arithm.gf
index 331a0d7c6..331a0d7c6 100644
--- a/examples/logic/Arithm.gf
+++ b/old-examples/logic/Arithm.gf
diff --git a/examples/logic/ArithmEng.gf b/old-examples/logic/ArithmEng.gf
index 942b6d7c2..942b6d7c2 100644
--- a/examples/logic/ArithmEng.gf
+++ b/old-examples/logic/ArithmEng.gf
diff --git a/examples/logic/LexTheory.gf b/old-examples/logic/LexTheory.gf
index a7a7c9439..a7a7c9439 100644
--- a/examples/logic/LexTheory.gf
+++ b/old-examples/logic/LexTheory.gf
diff --git a/examples/logic/LexTheoryEng.gf b/old-examples/logic/LexTheoryEng.gf
index 165e1796d..165e1796d 100644
--- a/examples/logic/LexTheoryEng.gf
+++ b/old-examples/logic/LexTheoryEng.gf
diff --git a/examples/logic/Logic.gf b/old-examples/logic/Logic.gf
index f7bb4ab57..f7bb4ab57 100644
--- a/examples/logic/Logic.gf
+++ b/old-examples/logic/Logic.gf
diff --git a/examples/logic/LogicEng.gf b/old-examples/logic/LogicEng.gf
index 18f466fa7..18f466fa7 100644
--- a/examples/logic/LogicEng.gf
+++ b/old-examples/logic/LogicEng.gf
diff --git a/examples/logic/LogicI.gf b/old-examples/logic/LogicI.gf
index 3598022ac..3598022ac 100644
--- a/examples/logic/LogicI.gf
+++ b/old-examples/logic/LogicI.gf
diff --git a/examples/logic/Prooftext.gf b/old-examples/logic/Prooftext.gf
index 1833d6308..1833d6308 100644
--- a/examples/logic/Prooftext.gf
+++ b/old-examples/logic/Prooftext.gf
diff --git a/examples/logic/ProoftextEng.gf b/old-examples/logic/ProoftextEng.gf
index 9ccd7a410..9ccd7a410 100644
--- a/examples/logic/ProoftextEng.gf
+++ b/old-examples/logic/ProoftextEng.gf
diff --git a/examples/logic/Theory.gf b/old-examples/logic/Theory.gf
index 778e0a8ec..778e0a8ec 100644
--- a/examples/logic/Theory.gf
+++ b/old-examples/logic/Theory.gf
diff --git a/examples/logic/TheoryEng.gf b/old-examples/logic/TheoryEng.gf
index a45bc0fdd..a45bc0fdd 100644
--- a/examples/logic/TheoryEng.gf
+++ b/old-examples/logic/TheoryEng.gf
diff --git a/examples/logic/TheoryI.gf b/old-examples/logic/TheoryI.gf
index 9ab457536..9ab457536 100644
--- a/examples/logic/TheoryI.gf
+++ b/old-examples/logic/TheoryI.gf
diff --git a/examples/math/Math.gf b/old-examples/math/Math.gf
index 35cfcbfdc..35cfcbfdc 100644
--- a/examples/math/Math.gf
+++ b/old-examples/math/Math.gf
diff --git a/examples/math/MathAgd.gf b/old-examples/math/MathAgd.gf
index 9b723c26e..9b723c26e 100644
--- a/examples/math/MathAgd.gf
+++ b/old-examples/math/MathAgd.gf
diff --git a/examples/math/MathEnz.gf b/old-examples/math/MathEnz.gf
index 2e3525032..2e3525032 100644
--- a/examples/math/MathEnz.gf
+++ b/old-examples/math/MathEnz.gf
diff --git a/examples/math/MathSwz.gf b/old-examples/math/MathSwz.gf
index 0d12a29e0..0d12a29e0 100644
--- a/examples/math/MathSwz.gf
+++ b/old-examples/math/MathSwz.gf
diff --git a/examples/model/Lex.gf b/old-examples/model/Lex.gf
index 3467e6870..3467e6870 100644
--- a/examples/model/Lex.gf
+++ b/old-examples/model/Lex.gf
diff --git a/examples/model/LexEng.gf b/old-examples/model/LexEng.gf
index c8f99c874..c8f99c874 100644
--- a/examples/model/LexEng.gf
+++ b/old-examples/model/LexEng.gf
diff --git a/examples/model/LexFre.gf b/old-examples/model/LexFre.gf
index 004195176..004195176 100644
--- a/examples/model/LexFre.gf
+++ b/old-examples/model/LexFre.gf
diff --git a/examples/model/Makefile b/old-examples/model/Makefile
index e551142ac..e551142ac 100644
--- a/examples/model/Makefile
+++ b/old-examples/model/Makefile
diff --git a/examples/model/Math.gf b/old-examples/model/Math.gf
index 036cab294..036cab294 100644
--- a/examples/model/Math.gf
+++ b/old-examples/model/Math.gf
diff --git a/examples/model/MathEng.gf b/old-examples/model/MathEng.gf
index 681ef5b31..681ef5b31 100644
--- a/examples/model/MathEng.gf
+++ b/old-examples/model/MathEng.gf
diff --git a/examples/model/MathFre.gf b/old-examples/model/MathFre.gf
index 2464907de..2464907de 100644
--- a/examples/model/MathFre.gf
+++ b/old-examples/model/MathFre.gf
diff --git a/examples/model/MathI.gf b/old-examples/model/MathI.gf
index 1d049633c..1d049633c 100644
--- a/examples/model/MathI.gf
+++ b/old-examples/model/MathI.gf
diff --git a/examples/model/Run.hs b/old-examples/model/Run.hs
index fa0cc8792..fa0cc8792 100644
--- a/examples/model/Run.hs
+++ b/old-examples/model/Run.hs
diff --git a/examples/model/model-resource-app.html b/old-examples/model/model-resource-app.html
index a9edfc44b..a9edfc44b 100644
--- a/examples/model/model-resource-app.html
+++ b/old-examples/model/model-resource-app.html
diff --git a/examples/model/model-resource-app.txt b/old-examples/model/model-resource-app.txt
index e35f97e77..e35f97e77 100644
--- a/examples/model/model-resource-app.txt
+++ b/old-examples/model/model-resource-app.txt
diff --git a/examples/mountaineering/Berg.gfwl b/old-examples/mountaineering/Berg.gfwl
index b35c8682f..b35c8682f 100644
--- a/examples/mountaineering/Berg.gfwl
+++ b/old-examples/mountaineering/Berg.gfwl
diff --git a/examples/mp3/Lexicon.gf b/old-examples/mp3/Lexicon.gf
index 8d3bccaf9..8d3bccaf9 100644
--- a/examples/mp3/Lexicon.gf
+++ b/old-examples/mp3/Lexicon.gf
diff --git a/examples/mp3/LexiconEng.gf b/old-examples/mp3/LexiconEng.gf
index 5b5861397..5b5861397 100644
--- a/examples/mp3/LexiconEng.gf
+++ b/old-examples/mp3/LexiconEng.gf
diff --git a/examples/mp3/LexiconFin.gf b/old-examples/mp3/LexiconFin.gf
index 757535bbf..757535bbf 100644
--- a/examples/mp3/LexiconFin.gf
+++ b/old-examples/mp3/LexiconFin.gf
diff --git a/examples/mp3/LexiconFre.gf b/old-examples/mp3/LexiconFre.gf
index 33188ca1b..33188ca1b 100644
--- a/examples/mp3/LexiconFre.gf
+++ b/old-examples/mp3/LexiconFre.gf
diff --git a/examples/mp3/LexiconGer.gf b/old-examples/mp3/LexiconGer.gf
index 729a64ac8..729a64ac8 100644
--- a/examples/mp3/LexiconGer.gf
+++ b/old-examples/mp3/LexiconGer.gf
diff --git a/examples/mp3/LexiconSwe.gf b/old-examples/mp3/LexiconSwe.gf
index f4b17080f..f4b17080f 100644
--- a/examples/mp3/LexiconSwe.gf
+++ b/old-examples/mp3/LexiconSwe.gf
diff --git a/examples/mp3/MP3.gf b/old-examples/mp3/MP3.gf
index cc4dd882a..cc4dd882a 100644
--- a/examples/mp3/MP3.gf
+++ b/old-examples/mp3/MP3.gf
diff --git a/examples/mp3/MP3Eng.gf b/old-examples/mp3/MP3Eng.gf
index 7648c1117..7648c1117 100644
--- a/examples/mp3/MP3Eng.gf
+++ b/old-examples/mp3/MP3Eng.gf
diff --git a/examples/mp3/MP3Fin.gf b/old-examples/mp3/MP3Fin.gf
index 099917c18..099917c18 100644
--- a/examples/mp3/MP3Fin.gf
+++ b/old-examples/mp3/MP3Fin.gf
diff --git a/examples/mp3/MP3Fre.gf b/old-examples/mp3/MP3Fre.gf
index 2fcd6b8f2..2fcd6b8f2 100644
--- a/examples/mp3/MP3Fre.gf
+++ b/old-examples/mp3/MP3Fre.gf
diff --git a/examples/mp3/MP3Ger.gf b/old-examples/mp3/MP3Ger.gf
index 5dfdfe19c..5dfdfe19c 100644
--- a/examples/mp3/MP3Ger.gf
+++ b/old-examples/mp3/MP3Ger.gf
diff --git a/examples/mp3/MP3I.gf b/old-examples/mp3/MP3I.gf
index ab8eb7915..ab8eb7915 100644
--- a/examples/mp3/MP3I.gf
+++ b/old-examples/mp3/MP3I.gf
diff --git a/examples/mp3/MP3Swe.gf b/old-examples/mp3/MP3Swe.gf
index 54e20171f..54e20171f 100644
--- a/examples/mp3/MP3Swe.gf
+++ b/old-examples/mp3/MP3Swe.gf
diff --git a/examples/mp3/mp3-resource.html b/old-examples/mp3/mp3-resource.html
index b1125d017..b1125d017 100644
--- a/examples/mp3/mp3-resource.html
+++ b/old-examples/mp3/mp3-resource.html
diff --git a/examples/mp3/mp3-resource.txt b/old-examples/mp3/mp3-resource.txt
index 60c39fcb7..60c39fcb7 100644
--- a/examples/mp3/mp3-resource.txt
+++ b/old-examples/mp3/mp3-resource.txt
diff --git a/examples/mp3/mp3.gfcm b/old-examples/mp3/mp3.gfcm
index 83ea7451f..83ea7451f 100644
--- a/examples/mp3/mp3.gfcm
+++ b/old-examples/mp3/mp3.gfcm
diff --git a/examples/numerals/Binary.gf b/old-examples/numerals/Binary.gf
index f053b64ba..f053b64ba 100644
--- a/examples/numerals/Binary.gf
+++ b/old-examples/numerals/Binary.gf
diff --git a/examples/numerals/BinaryDigits.gf b/old-examples/numerals/BinaryDigits.gf
index 3a30a993c..3a30a993c 100644
--- a/examples/numerals/BinaryDigits.gf
+++ b/old-examples/numerals/BinaryDigits.gf
diff --git a/examples/numerals/MkScript.hs b/old-examples/numerals/MkScript.hs
index 0b0890b5d..0b0890b5d 100644
--- a/examples/numerals/MkScript.hs
+++ b/old-examples/numerals/MkScript.hs
diff --git a/examples/numerals/README b/old-examples/numerals/README
index d149ccf3d..d149ccf3d 100644
--- a/examples/numerals/README
+++ b/old-examples/numerals/README
diff --git a/examples/numerals/af_tunni.gf b/old-examples/numerals/af_tunni.gf
index 600397690..600397690 100644
--- a/examples/numerals/af_tunni.gf
+++ b/old-examples/numerals/af_tunni.gf
diff --git a/examples/numerals/albanian.gf b/old-examples/numerals/albanian.gf
index 63c3f518f..63c3f518f 100644
--- a/examples/numerals/albanian.gf
+++ b/old-examples/numerals/albanian.gf
diff --git a/examples/numerals/amharic.gf b/old-examples/numerals/amharic.gf
index 6ffab9a8c..6ffab9a8c 100644
--- a/examples/numerals/amharic.gf
+++ b/old-examples/numerals/amharic.gf
diff --git a/examples/numerals/arabic_classical.gf b/old-examples/numerals/arabic_classical.gf
index af35b8435..af35b8435 100644
--- a/examples/numerals/arabic_classical.gf
+++ b/old-examples/numerals/arabic_classical.gf
diff --git a/examples/numerals/arabic_modern.gf b/old-examples/numerals/arabic_modern.gf
index c507f9544..c507f9544 100644
--- a/examples/numerals/arabic_modern.gf
+++ b/old-examples/numerals/arabic_modern.gf
diff --git a/examples/numerals/basque.gf b/old-examples/numerals/basque.gf
index ba77d9219..ba77d9219 100644
--- a/examples/numerals/basque.gf
+++ b/old-examples/numerals/basque.gf
diff --git a/examples/numerals/bearlake_slave.gf b/old-examples/numerals/bearlake_slave.gf
index ddfb14271..ddfb14271 100644
--- a/examples/numerals/bearlake_slave.gf
+++ b/old-examples/numerals/bearlake_slave.gf
diff --git a/examples/numerals/bulgarian.gf b/old-examples/numerals/bulgarian.gf
index 6d17e85b6..6d17e85b6 100644
--- a/examples/numerals/bulgarian.gf
+++ b/old-examples/numerals/bulgarian.gf
diff --git a/examples/numerals/catalan.gf b/old-examples/numerals/catalan.gf
index e16e0c6b2..e16e0c6b2 100644
--- a/examples/numerals/catalan.gf
+++ b/old-examples/numerals/catalan.gf
diff --git a/examples/numerals/chinese.gf b/old-examples/numerals/chinese.gf
index 93d7395b3..93d7395b3 100644
--- a/examples/numerals/chinese.gf
+++ b/old-examples/numerals/chinese.gf
diff --git a/examples/numerals/croatian.gf b/old-examples/numerals/croatian.gf
index 85bd4fe6b..85bd4fe6b 100644
--- a/examples/numerals/croatian.gf
+++ b/old-examples/numerals/croatian.gf
diff --git a/examples/numerals/czech.gf b/old-examples/numerals/czech.gf
index 59f32efd2..59f32efd2 100644
--- a/examples/numerals/czech.gf
+++ b/old-examples/numerals/czech.gf
diff --git a/examples/numerals/dagur.gf b/old-examples/numerals/dagur.gf
index 80cfdf45b..80cfdf45b 100644
--- a/examples/numerals/dagur.gf
+++ b/old-examples/numerals/dagur.gf
diff --git a/examples/numerals/danish.gf b/old-examples/numerals/danish.gf
index d1f97525f..d1f97525f 100644
--- a/examples/numerals/danish.gf
+++ b/old-examples/numerals/danish.gf
diff --git a/examples/numerals/decimal.gf b/old-examples/numerals/decimal.gf
index 44076fea0..44076fea0 100644
--- a/examples/numerals/decimal.gf
+++ b/old-examples/numerals/decimal.gf
diff --git a/examples/numerals/dutch.gf b/old-examples/numerals/dutch.gf
index 69f101f04..69f101f04 100644
--- a/examples/numerals/dutch.gf
+++ b/old-examples/numerals/dutch.gf
diff --git a/examples/numerals/english.gf b/old-examples/numerals/english.gf
index 270b0c9d6..270b0c9d6 100644
--- a/examples/numerals/english.gf
+++ b/old-examples/numerals/english.gf
diff --git a/examples/numerals/finnish.gf b/old-examples/numerals/finnish.gf
index b1514554b..b1514554b 100644
--- a/examples/numerals/finnish.gf
+++ b/old-examples/numerals/finnish.gf
diff --git a/examples/numerals/french.gf b/old-examples/numerals/french.gf
index 532a4598d..532a4598d 100644
--- a/examples/numerals/french.gf
+++ b/old-examples/numerals/french.gf
diff --git a/examples/numerals/french_belgian.gf b/old-examples/numerals/french_belgian.gf
index e6c80549e..e6c80549e 100644
--- a/examples/numerals/french_belgian.gf
+++ b/old-examples/numerals/french_belgian.gf
diff --git a/examples/numerals/french_swiss.gf b/old-examples/numerals/french_swiss.gf
index 77c76f0c7..77c76f0c7 100644
--- a/examples/numerals/french_swiss.gf
+++ b/old-examples/numerals/french_swiss.gf
diff --git a/examples/numerals/fulfulde.gf b/old-examples/numerals/fulfulde.gf
index 0531d35de..0531d35de 100644
--- a/examples/numerals/fulfulde.gf
+++ b/old-examples/numerals/fulfulde.gf
diff --git a/examples/numerals/geez.gf b/old-examples/numerals/geez.gf
index 5761317a3..5761317a3 100644
--- a/examples/numerals/geez.gf
+++ b/old-examples/numerals/geez.gf
diff --git a/examples/numerals/german.gf b/old-examples/numerals/german.gf
index e155e3c8f..e155e3c8f 100644
--- a/examples/numerals/german.gf
+++ b/old-examples/numerals/german.gf
diff --git a/examples/numerals/greek_classical.gf b/old-examples/numerals/greek_classical.gf
index cdfb115ec..cdfb115ec 100644
--- a/examples/numerals/greek_classical.gf
+++ b/old-examples/numerals/greek_classical.gf
diff --git a/examples/numerals/greek_modern.gf b/old-examples/numerals/greek_modern.gf
index c2a4e77b3..c2a4e77b3 100644
--- a/examples/numerals/greek_modern.gf
+++ b/old-examples/numerals/greek_modern.gf
diff --git a/examples/numerals/guahibo.gf b/old-examples/numerals/guahibo.gf
index eace4ed42..eace4ed42 100644
--- a/examples/numerals/guahibo.gf
+++ b/old-examples/numerals/guahibo.gf
diff --git a/examples/numerals/guarani.gf b/old-examples/numerals/guarani.gf
index 9df3ce70e..9df3ce70e 100644
--- a/examples/numerals/guarani.gf
+++ b/old-examples/numerals/guarani.gf
diff --git a/examples/numerals/hebrew_biblical.gf b/old-examples/numerals/hebrew_biblical.gf
index d984ea0c3..d984ea0c3 100644
--- a/examples/numerals/hebrew_biblical.gf
+++ b/old-examples/numerals/hebrew_biblical.gf
diff --git a/examples/numerals/hindi.gf b/old-examples/numerals/hindi.gf
index 0b8d24ee9..0b8d24ee9 100644
--- a/examples/numerals/hindi.gf
+++ b/old-examples/numerals/hindi.gf
diff --git a/examples/numerals/hungarian.gf b/old-examples/numerals/hungarian.gf
index 2489fb6ef..2489fb6ef 100644
--- a/examples/numerals/hungarian.gf
+++ b/old-examples/numerals/hungarian.gf
diff --git a/examples/numerals/icelandic.gf b/old-examples/numerals/icelandic.gf
index 37731783c..37731783c 100644
--- a/examples/numerals/icelandic.gf
+++ b/old-examples/numerals/icelandic.gf
diff --git a/examples/numerals/interlingua.gf b/old-examples/numerals/interlingua.gf
index acd431688..acd431688 100644
--- a/examples/numerals/interlingua.gf
+++ b/old-examples/numerals/interlingua.gf
diff --git a/examples/numerals/irish.gf b/old-examples/numerals/irish.gf
index 71e44a783..71e44a783 100644
--- a/examples/numerals/irish.gf
+++ b/old-examples/numerals/irish.gf
diff --git a/examples/numerals/irula.gf b/old-examples/numerals/irula.gf
index 9d060519a..9d060519a 100644
--- a/examples/numerals/irula.gf
+++ b/old-examples/numerals/irula.gf
diff --git a/examples/numerals/italian.gf b/old-examples/numerals/italian.gf
index b2ca6be2c..b2ca6be2c 100644
--- a/examples/numerals/italian.gf
+++ b/old-examples/numerals/italian.gf
diff --git a/examples/numerals/japanese.gf b/old-examples/numerals/japanese.gf
index 4777c6eb2..4777c6eb2 100644
--- a/examples/numerals/japanese.gf
+++ b/old-examples/numerals/japanese.gf
diff --git a/examples/numerals/kabardian.gf b/old-examples/numerals/kabardian.gf
index 9acb469fe..9acb469fe 100644
--- a/examples/numerals/kabardian.gf
+++ b/old-examples/numerals/kabardian.gf
diff --git a/examples/numerals/kambera.gf b/old-examples/numerals/kambera.gf
index 3e281a766..3e281a766 100644
--- a/examples/numerals/kambera.gf
+++ b/old-examples/numerals/kambera.gf
diff --git a/examples/numerals/kawaiisu.gf b/old-examples/numerals/kawaiisu.gf
index 5e45a4eb6..5e45a4eb6 100644
--- a/examples/numerals/kawaiisu.gf
+++ b/old-examples/numerals/kawaiisu.gf
diff --git a/examples/numerals/khmer.gf b/old-examples/numerals/khmer.gf
index 7a718b914..7a718b914 100644
--- a/examples/numerals/khmer.gf
+++ b/old-examples/numerals/khmer.gf
diff --git a/examples/numerals/khowar.gf b/old-examples/numerals/khowar.gf
index 5e4e73655..5e4e73655 100644
--- a/examples/numerals/khowar.gf
+++ b/old-examples/numerals/khowar.gf
diff --git a/examples/numerals/kodagu.gf b/old-examples/numerals/kodagu.gf
index 48703d0fd..48703d0fd 100644
--- a/examples/numerals/kodagu.gf
+++ b/old-examples/numerals/kodagu.gf
diff --git a/examples/numerals/kolyma_yukaghir.gf b/old-examples/numerals/kolyma_yukaghir.gf
index 21deebe5c..21deebe5c 100644
--- a/examples/numerals/kolyma_yukaghir.gf
+++ b/old-examples/numerals/kolyma_yukaghir.gf
diff --git a/examples/numerals/korean.gf b/old-examples/numerals/korean.gf
index f00b89695..f00b89695 100644
--- a/examples/numerals/korean.gf
+++ b/old-examples/numerals/korean.gf
diff --git a/examples/numerals/kulung.gf b/old-examples/numerals/kulung.gf
index c14028b5c..c14028b5c 100644
--- a/examples/numerals/kulung.gf
+++ b/old-examples/numerals/kulung.gf
diff --git a/examples/numerals/kwami.gf b/old-examples/numerals/kwami.gf
index 43e56456b..43e56456b 100644
--- a/examples/numerals/kwami.gf
+++ b/old-examples/numerals/kwami.gf
diff --git a/examples/numerals/kwaza.gf b/old-examples/numerals/kwaza.gf
index e8ed82487..e8ed82487 100644
--- a/examples/numerals/kwaza.gf
+++ b/old-examples/numerals/kwaza.gf
diff --git a/examples/numerals/lalo.gf b/old-examples/numerals/lalo.gf
index 21e9cb290..21e9cb290 100644
--- a/examples/numerals/lalo.gf
+++ b/old-examples/numerals/lalo.gf
diff --git a/examples/numerals/lamani.gf b/old-examples/numerals/lamani.gf
index a627bb4c5..a627bb4c5 100644
--- a/examples/numerals/lamani.gf
+++ b/old-examples/numerals/lamani.gf
diff --git a/examples/numerals/latvian.gf b/old-examples/numerals/latvian.gf
index 299ef0b0c..299ef0b0c 100644
--- a/examples/numerals/latvian.gf
+++ b/old-examples/numerals/latvian.gf
diff --git a/examples/numerals/lithuanian.gf b/old-examples/numerals/lithuanian.gf
index f2d4f5c61..f2d4f5c61 100644
--- a/examples/numerals/lithuanian.gf
+++ b/old-examples/numerals/lithuanian.gf
diff --git a/examples/numerals/lotuxo.gf b/old-examples/numerals/lotuxo.gf
index 02ddf52ff..02ddf52ff 100644
--- a/examples/numerals/lotuxo.gf
+++ b/old-examples/numerals/lotuxo.gf
diff --git a/examples/numerals/maale.gf b/old-examples/numerals/maale.gf
index 5b8d309a0..5b8d309a0 100644
--- a/examples/numerals/maale.gf
+++ b/old-examples/numerals/maale.gf
diff --git a/examples/numerals/malay.gf b/old-examples/numerals/malay.gf
index 1213a96ee..1213a96ee 100644
--- a/examples/numerals/malay.gf
+++ b/old-examples/numerals/malay.gf
diff --git a/examples/numerals/maltese.gf b/old-examples/numerals/maltese.gf
index 153f6a9c9..153f6a9c9 100644
--- a/examples/numerals/maltese.gf
+++ b/old-examples/numerals/maltese.gf
diff --git a/examples/numerals/mapuche.gf b/old-examples/numerals/mapuche.gf
index 84450daa2..84450daa2 100644
--- a/examples/numerals/mapuche.gf
+++ b/old-examples/numerals/mapuche.gf
diff --git a/examples/numerals/margi.gf b/old-examples/numerals/margi.gf
index 27a7f9377..27a7f9377 100644
--- a/examples/numerals/margi.gf
+++ b/old-examples/numerals/margi.gf
diff --git a/examples/numerals/maybrat.gf b/old-examples/numerals/maybrat.gf
index 604addcdd..604addcdd 100644
--- a/examples/numerals/maybrat.gf
+++ b/old-examples/numerals/maybrat.gf
diff --git a/examples/numerals/miya.gf b/old-examples/numerals/miya.gf
index ae2ad4a62..ae2ad4a62 100644
--- a/examples/numerals/miya.gf
+++ b/old-examples/numerals/miya.gf
diff --git a/examples/numerals/mkNumerals.gfs b/old-examples/numerals/mkNumerals.gfs
index 7799c6c55..7799c6c55 100644
--- a/examples/numerals/mkNumerals.gfs
+++ b/old-examples/numerals/mkNumerals.gfs
diff --git a/examples/numerals/mkThai.gfs b/old-examples/numerals/mkThai.gfs
index e821f50f1..e821f50f1 100644
--- a/examples/numerals/mkThai.gfs
+++ b/old-examples/numerals/mkThai.gfs
diff --git a/examples/numerals/mongolian.gf b/old-examples/numerals/mongolian.gf
index f4bd79c66..f4bd79c66 100644
--- a/examples/numerals/mongolian.gf
+++ b/old-examples/numerals/mongolian.gf
diff --git a/examples/numerals/nenets.gf b/old-examples/numerals/nenets.gf
index 6ab6cb44b..6ab6cb44b 100644
--- a/examples/numerals/nenets.gf
+++ b/old-examples/numerals/nenets.gf
diff --git a/examples/numerals/norwegian_book.gf b/old-examples/numerals/norwegian_book.gf
index 437122b40..437122b40 100644
--- a/examples/numerals/norwegian_book.gf
+++ b/old-examples/numerals/norwegian_book.gf
diff --git a/examples/numerals/numerals.Abs.gf b/old-examples/numerals/numerals.Abs.gf
index 90aae3cb7..90aae3cb7 100644
--- a/examples/numerals/numerals.Abs.gf
+++ b/old-examples/numerals/numerals.Abs.gf
diff --git a/examples/numerals/old_church_slavonic.gf b/old-examples/numerals/old_church_slavonic.gf
index 6072bbec8..6072bbec8 100644
--- a/examples/numerals/old_church_slavonic.gf
+++ b/old-examples/numerals/old_church_slavonic.gf
diff --git a/examples/numerals/oromo.gf b/old-examples/numerals/oromo.gf
index a8a43a581..a8a43a581 100644
--- a/examples/numerals/oromo.gf
+++ b/old-examples/numerals/oromo.gf
diff --git a/examples/numerals/pashto.gf b/old-examples/numerals/pashto.gf
index 85239828a..85239828a 100644
--- a/examples/numerals/pashto.gf
+++ b/old-examples/numerals/pashto.gf
diff --git a/examples/numerals/polish.gf b/old-examples/numerals/polish.gf
index b5d57bc92..b5d57bc92 100644
--- a/examples/numerals/polish.gf
+++ b/old-examples/numerals/polish.gf
diff --git a/examples/numerals/portuguese.gf b/old-examples/numerals/portuguese.gf
index bf3fb1b2e..bf3fb1b2e 100644
--- a/examples/numerals/portuguese.gf
+++ b/old-examples/numerals/portuguese.gf
diff --git a/examples/numerals/quechua.gf b/old-examples/numerals/quechua.gf
index cd6925159..cd6925159 100644
--- a/examples/numerals/quechua.gf
+++ b/old-examples/numerals/quechua.gf
diff --git a/examples/numerals/romanian.gf b/old-examples/numerals/romanian.gf
index e339e0c1a..e339e0c1a 100644
--- a/examples/numerals/romanian.gf
+++ b/old-examples/numerals/romanian.gf
diff --git a/examples/numerals/russian.gf b/old-examples/numerals/russian.gf
index 34c48e88c..34c48e88c 100644
--- a/examples/numerals/russian.gf
+++ b/old-examples/numerals/russian.gf
diff --git a/examples/numerals/sango.gf b/old-examples/numerals/sango.gf
index f96874ede..f96874ede 100644
--- a/examples/numerals/sango.gf
+++ b/old-examples/numerals/sango.gf
diff --git a/examples/numerals/sanskrit.gf b/old-examples/numerals/sanskrit.gf
index 532ac248d..532ac248d 100644
--- a/examples/numerals/sanskrit.gf
+++ b/old-examples/numerals/sanskrit.gf
diff --git a/examples/numerals/slovak.gf b/old-examples/numerals/slovak.gf
index 9e781429e..9e781429e 100644
--- a/examples/numerals/slovak.gf
+++ b/old-examples/numerals/slovak.gf
diff --git a/examples/numerals/sorani.gf b/old-examples/numerals/sorani.gf
index ec29c0846..ec29c0846 100644
--- a/examples/numerals/sorani.gf
+++ b/old-examples/numerals/sorani.gf
diff --git a/examples/numerals/spanish.gf b/old-examples/numerals/spanish.gf
index 30d7e46a4..30d7e46a4 100644
--- a/examples/numerals/spanish.gf
+++ b/old-examples/numerals/spanish.gf
diff --git a/examples/numerals/stieng.gf b/old-examples/numerals/stieng.gf
index f03e6a0f6..f03e6a0f6 100644
--- a/examples/numerals/stieng.gf
+++ b/old-examples/numerals/stieng.gf
diff --git a/examples/numerals/swahili.gf b/old-examples/numerals/swahili.gf
index e3613e986..e3613e986 100644
--- a/examples/numerals/swahili.gf
+++ b/old-examples/numerals/swahili.gf
diff --git a/examples/numerals/swedish.gf b/old-examples/numerals/swedish.gf
index 4d0796bef..4d0796bef 100644
--- a/examples/numerals/swedish.gf
+++ b/old-examples/numerals/swedish.gf
diff --git a/examples/numerals/tamil.gf b/old-examples/numerals/tamil.gf
index 669ae9584..669ae9584 100644
--- a/examples/numerals/tamil.gf
+++ b/old-examples/numerals/tamil.gf
diff --git a/examples/numerals/tampere.gf b/old-examples/numerals/tampere.gf
index e9fff3524..e9fff3524 100644
--- a/examples/numerals/tampere.gf
+++ b/old-examples/numerals/tampere.gf
diff --git a/examples/numerals/thai.gf b/old-examples/numerals/thai.gf
index 94bbe3982..94bbe3982 100644
--- a/examples/numerals/thai.gf
+++ b/old-examples/numerals/thai.gf
diff --git a/examples/numerals/thaiDU.gf b/old-examples/numerals/thaiDU.gf
index 1cbf81fbc..1cbf81fbc 100644
--- a/examples/numerals/thaiDU.gf
+++ b/old-examples/numerals/thaiDU.gf
diff --git a/examples/numerals/thaiP.gf b/old-examples/numerals/thaiP.gf
index c35b2dfbf..c35b2dfbf 100644
--- a/examples/numerals/thaiP.gf
+++ b/old-examples/numerals/thaiP.gf
diff --git a/examples/numerals/thaiU.gf b/old-examples/numerals/thaiU.gf
index 35fbd8e8b..35fbd8e8b 100644
--- a/examples/numerals/thaiU.gf
+++ b/old-examples/numerals/thaiU.gf
diff --git a/examples/numerals/tibetan.gf b/old-examples/numerals/tibetan.gf
index 2ca775b4d..2ca775b4d 100644
--- a/examples/numerals/tibetan.gf
+++ b/old-examples/numerals/tibetan.gf
diff --git a/examples/numerals/totonac.gf b/old-examples/numerals/totonac.gf
index 1b843b1db..1b843b1db 100644
--- a/examples/numerals/totonac.gf
+++ b/old-examples/numerals/totonac.gf
diff --git a/examples/numerals/tuda_daza.gf b/old-examples/numerals/tuda_daza.gf
index 334882ced..334882ced 100644
--- a/examples/numerals/tuda_daza.gf
+++ b/old-examples/numerals/tuda_daza.gf
diff --git a/examples/numerals/tukang_besi.gf b/old-examples/numerals/tukang_besi.gf
index d2b7c6f1c..d2b7c6f1c 100644
--- a/examples/numerals/tukang_besi.gf
+++ b/old-examples/numerals/tukang_besi.gf
diff --git a/examples/numerals/turkish.gf b/old-examples/numerals/turkish.gf
index ce391f13e..ce391f13e 100644
--- a/examples/numerals/turkish.gf
+++ b/old-examples/numerals/turkish.gf
diff --git a/examples/numerals/votic.gf b/old-examples/numerals/votic.gf
index 362c465a6..362c465a6 100644
--- a/examples/numerals/votic.gf
+++ b/old-examples/numerals/votic.gf
diff --git a/examples/numerals/welsh.gf b/old-examples/numerals/welsh.gf
index 54a2ca640..54a2ca640 100644
--- a/examples/numerals/welsh.gf
+++ b/old-examples/numerals/welsh.gf
diff --git a/examples/numerals/yasin_burushaski.gf b/old-examples/numerals/yasin_burushaski.gf
index 53ec8967f..53ec8967f 100644
--- a/examples/numerals/yasin_burushaski.gf
+++ b/old-examples/numerals/yasin_burushaski.gf
diff --git a/examples/numerals/zaiwa.gf b/old-examples/numerals/zaiwa.gf
index 859378c49..859378c49 100644
--- a/examples/numerals/zaiwa.gf
+++ b/old-examples/numerals/zaiwa.gf
diff --git a/examples/peacekeeping/EXAMPLES b/old-examples/peacekeeping/EXAMPLES
index 822e649eb..822e649eb 100644
--- a/examples/peacekeeping/EXAMPLES
+++ b/old-examples/peacekeeping/EXAMPLES
diff --git a/examples/peacekeeping/Peace.gf b/old-examples/peacekeeping/Peace.gf
index f7514ac8b..f7514ac8b 100644
--- a/examples/peacekeeping/Peace.gf
+++ b/old-examples/peacekeeping/Peace.gf
diff --git a/examples/peacekeeping/PeaceCat.gf b/old-examples/peacekeeping/PeaceCat.gf
index 103295396..103295396 100644
--- a/examples/peacekeeping/PeaceCat.gf
+++ b/old-examples/peacekeeping/PeaceCat.gf
diff --git a/examples/peacekeeping/PeaceCatI.gf b/old-examples/peacekeeping/PeaceCatI.gf
index 312bc1b1e..312bc1b1e 100644
--- a/examples/peacekeeping/PeaceCatI.gf
+++ b/old-examples/peacekeeping/PeaceCatI.gf
diff --git a/examples/peacekeeping/PeaceLexCommon.gf b/old-examples/peacekeeping/PeaceLexCommon.gf
index 75abaebdf..75abaebdf 100644
--- a/examples/peacekeeping/PeaceLexCommon.gf
+++ b/old-examples/peacekeeping/PeaceLexCommon.gf
diff --git a/examples/peacekeeping/PeaceLexCommonI.gf b/old-examples/peacekeeping/PeaceLexCommonI.gf
index b76949cb9..b76949cb9 100644
--- a/examples/peacekeeping/PeaceLexCommonI.gf
+++ b/old-examples/peacekeeping/PeaceLexCommonI.gf
diff --git a/examples/peacekeeping/PeaceLexExt.gf b/old-examples/peacekeeping/PeaceLexExt.gf
index 984440ef6..984440ef6 100644
--- a/examples/peacekeeping/PeaceLexExt.gf
+++ b/old-examples/peacekeeping/PeaceLexExt.gf
diff --git a/examples/peacekeeping/PeacePhrases.gf b/old-examples/peacekeeping/PeacePhrases.gf
index e883e9e19..e883e9e19 100644
--- a/examples/peacekeeping/PeacePhrases.gf
+++ b/old-examples/peacekeeping/PeacePhrases.gf
diff --git a/examples/peacekeeping/PeaceRes.gf b/old-examples/peacekeeping/PeaceRes.gf
index 52d77ce3b..52d77ce3b 100644
--- a/examples/peacekeeping/PeaceRes.gf
+++ b/old-examples/peacekeeping/PeaceRes.gf
diff --git a/examples/peacekeeping/PeaceSpoken.gf b/old-examples/peacekeeping/PeaceSpoken.gf
index 59d7210f3..59d7210f3 100644
--- a/examples/peacekeeping/PeaceSpoken.gf
+++ b/old-examples/peacekeeping/PeaceSpoken.gf
diff --git a/examples/peacekeeping/PeaceSyntax.gf b/old-examples/peacekeeping/PeaceSyntax.gf
index 21b852d63..21b852d63 100644
--- a/examples/peacekeeping/PeaceSyntax.gf
+++ b/old-examples/peacekeeping/PeaceSyntax.gf
diff --git a/examples/peacekeeping/PeaceSyntaxI.gf b/old-examples/peacekeeping/PeaceSyntaxI.gf
index 89517d735..89517d735 100644
--- a/examples/peacekeeping/PeaceSyntaxI.gf
+++ b/old-examples/peacekeeping/PeaceSyntaxI.gf
diff --git a/examples/peacekeeping/README b/old-examples/peacekeeping/README
index f17025853..f17025853 100644
--- a/examples/peacekeeping/README
+++ b/old-examples/peacekeeping/README
diff --git a/examples/peacekeeping/english/PeaceCat_Eng.gf b/old-examples/peacekeeping/english/PeaceCat_Eng.gf
index d73e1d581..d73e1d581 100644
--- a/examples/peacekeeping/english/PeaceCat_Eng.gf
+++ b/old-examples/peacekeeping/english/PeaceCat_Eng.gf
diff --git a/examples/peacekeeping/english/PeaceLexCommon_Eng.gf b/old-examples/peacekeeping/english/PeaceLexCommon_Eng.gf
index fc3ab664d..fc3ab664d 100644
--- a/examples/peacekeeping/english/PeaceLexCommon_Eng.gf
+++ b/old-examples/peacekeeping/english/PeaceLexCommon_Eng.gf
diff --git a/examples/peacekeeping/english/PeaceLexExt_Eng.gf b/old-examples/peacekeeping/english/PeaceLexExt_Eng.gf
index 6ecfcf341..6ecfcf341 100644
--- a/examples/peacekeeping/english/PeaceLexExt_Eng.gf
+++ b/old-examples/peacekeeping/english/PeaceLexExt_Eng.gf
diff --git a/examples/peacekeeping/english/PeacePhrases_Eng.gf b/old-examples/peacekeeping/english/PeacePhrases_Eng.gf
index 8bcf41ce0..8bcf41ce0 100644
--- a/examples/peacekeeping/english/PeacePhrases_Eng.gf
+++ b/old-examples/peacekeeping/english/PeacePhrases_Eng.gf
diff --git a/examples/peacekeeping/english/PeaceSpoken_Eng.gf b/old-examples/peacekeeping/english/PeaceSpoken_Eng.gf
index bdd81bd9f..bdd81bd9f 100644
--- a/examples/peacekeeping/english/PeaceSpoken_Eng.gf
+++ b/old-examples/peacekeeping/english/PeaceSpoken_Eng.gf
diff --git a/examples/peacekeeping/english/PeaceSyntax_Eng.gf b/old-examples/peacekeeping/english/PeaceSyntax_Eng.gf
index 674e1e123..674e1e123 100644
--- a/examples/peacekeeping/english/PeaceSyntax_Eng.gf
+++ b/old-examples/peacekeeping/english/PeaceSyntax_Eng.gf
diff --git a/examples/peacekeeping/english/Peace_Eng.gf b/old-examples/peacekeeping/english/Peace_Eng.gf
index dff33298b..dff33298b 100644
--- a/examples/peacekeeping/english/Peace_Eng.gf
+++ b/old-examples/peacekeeping/english/Peace_Eng.gf
diff --git a/examples/peacekeeping/finnish/PeaceCat_Fin.gf b/old-examples/peacekeeping/finnish/PeaceCat_Fin.gf
index b5e73aaf1..b5e73aaf1 100644
--- a/examples/peacekeeping/finnish/PeaceCat_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeaceCat_Fin.gf
diff --git a/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf b/old-examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
index aad047909..aad047909 100644
--- a/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
diff --git a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf b/old-examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
index eade50a49..eade50a49 100644
--- a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
diff --git a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf b/old-examples/peacekeeping/finnish/PeacePhrases_Fin.gf
index bd528c36b..bd528c36b 100644
--- a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeacePhrases_Fin.gf
diff --git a/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf b/old-examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
index 98a23732b..98a23732b 100644
--- a/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
diff --git a/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf b/old-examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
index 80bd821c4..80bd821c4 100644
--- a/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
+++ b/old-examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
diff --git a/examples/peacekeeping/finnish/Peace_Fin.gf b/old-examples/peacekeeping/finnish/Peace_Fin.gf
index f8e19d2b6..f8e19d2b6 100644
--- a/examples/peacekeeping/finnish/Peace_Fin.gf
+++ b/old-examples/peacekeeping/finnish/Peace_Fin.gf
diff --git a/examples/peacekeeping/mkPeace.gfs b/old-examples/peacekeeping/mkPeace.gfs
index 169cc8480..169cc8480 100644
--- a/examples/peacekeeping/mkPeace.gfs
+++ b/old-examples/peacekeeping/mkPeace.gfs
diff --git a/examples/peacekeeping/swedish/PeaceCat_Swe.gf b/old-examples/peacekeeping/swedish/PeaceCat_Swe.gf
index 5ccfb2ed5..5ccfb2ed5 100644
--- a/examples/peacekeeping/swedish/PeaceCat_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeaceCat_Swe.gf
diff --git a/examples/peacekeeping/swedish/PeaceLexCommon_Swe.gf b/old-examples/peacekeeping/swedish/PeaceLexCommon_Swe.gf
index 8f516ff7d..8f516ff7d 100644
--- a/examples/peacekeeping/swedish/PeaceLexCommon_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeaceLexCommon_Swe.gf
diff --git a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf b/old-examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
index 5f40fc6b6..5f40fc6b6 100644
--- a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
diff --git a/examples/peacekeeping/swedish/PeacePhrases_Swe.gf b/old-examples/peacekeeping/swedish/PeacePhrases_Swe.gf
index 7f9d88014..7f9d88014 100644
--- a/examples/peacekeeping/swedish/PeacePhrases_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeacePhrases_Swe.gf
diff --git a/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf b/old-examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
index d622a1c07..d622a1c07 100644
--- a/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
diff --git a/examples/peacekeeping/swedish/PeaceSyntax_Swe.gf b/old-examples/peacekeeping/swedish/PeaceSyntax_Swe.gf
index 4fd59e564..4fd59e564 100644
--- a/examples/peacekeeping/swedish/PeaceSyntax_Swe.gf
+++ b/old-examples/peacekeeping/swedish/PeaceSyntax_Swe.gf
diff --git a/examples/peacekeeping/swedish/Peace_Swe.gf b/old-examples/peacekeeping/swedish/Peace_Swe.gf
index c08e227d3..c08e227d3 100644
--- a/examples/peacekeeping/swedish/Peace_Swe.gf
+++ b/old-examples/peacekeeping/swedish/Peace_Swe.gf
diff --git a/examples/query/Database.gf b/old-examples/query/Database.gf
index 2385b8670..2385b8670 100644
--- a/examples/query/Database.gf
+++ b/old-examples/query/Database.gf
diff --git a/examples/query/DatabaseEng.gf b/old-examples/query/DatabaseEng.gf
index 6af490678..6af490678 100644
--- a/examples/query/DatabaseEng.gf
+++ b/old-examples/query/DatabaseEng.gf
diff --git a/examples/query/Makefile b/old-examples/query/Makefile
index 08ab63ae1..08ab63ae1 100644
--- a/examples/query/Makefile
+++ b/old-examples/query/Makefile
diff --git a/examples/query/README b/old-examples/query/README
index e1ce93098..e1ce93098 100644
--- a/examples/query/README
+++ b/old-examples/query/README
diff --git a/examples/query/UseDatabase.hs b/old-examples/query/UseDatabase.hs
index cf90ae2a4..cf90ae2a4 100644
--- a/examples/query/UseDatabase.hs
+++ b/old-examples/query/UseDatabase.hs
diff --git a/examples/regulus/README b/old-examples/regulus/README
index b3659c5e2..b3659c5e2 100644
--- a/examples/regulus/README
+++ b/old-examples/regulus/README
diff --git a/examples/regulus/toy0/Toy0.gf b/old-examples/regulus/toy0/Toy0.gf
index b1e2d6a40..b1e2d6a40 100644
--- a/examples/regulus/toy0/Toy0.gf
+++ b/old-examples/regulus/toy0/Toy0.gf
diff --git a/examples/regulus/toy0/Toy0Eng.gf b/old-examples/regulus/toy0/Toy0Eng.gf
index edfe520e4..edfe520e4 100644
--- a/examples/regulus/toy0/Toy0Eng.gf
+++ b/old-examples/regulus/toy0/Toy0Eng.gf
diff --git a/examples/regulus/toy0/Toy0Fin.gf b/old-examples/regulus/toy0/Toy0Fin.gf
index f550e751e..f550e751e 100644
--- a/examples/regulus/toy0/Toy0Fin.gf
+++ b/old-examples/regulus/toy0/Toy0Fin.gf
diff --git a/examples/regulus/toy0/Toy0Fre.gf b/old-examples/regulus/toy0/Toy0Fre.gf
index 513e9b390..513e9b390 100644
--- a/examples/regulus/toy0/Toy0Fre.gf
+++ b/old-examples/regulus/toy0/Toy0Fre.gf
diff --git a/examples/regulus/toy0/Toy0I.gf b/old-examples/regulus/toy0/Toy0I.gf
index efb6e730a..efb6e730a 100644
--- a/examples/regulus/toy0/Toy0I.gf
+++ b/old-examples/regulus/toy0/Toy0I.gf
diff --git a/examples/regulus/toy0/Toy0Swe.gf b/old-examples/regulus/toy0/Toy0Swe.gf
index 5de273d00..5de273d00 100644
--- a/examples/regulus/toy0/Toy0Swe.gf
+++ b/old-examples/regulus/toy0/Toy0Swe.gf
diff --git a/examples/regulus/toy0/example-based/Toy0.gf b/old-examples/regulus/toy0/example-based/Toy0.gf
index b1e2d6a40..b1e2d6a40 100644
--- a/examples/regulus/toy0/example-based/Toy0.gf
+++ b/old-examples/regulus/toy0/example-based/Toy0.gf
diff --git a/examples/regulus/toy0/example-based/Toy0Ger.gf b/old-examples/regulus/toy0/example-based/Toy0Ger.gf
index 7355cbfac..7355cbfac 100644
--- a/examples/regulus/toy0/example-based/Toy0Ger.gf
+++ b/old-examples/regulus/toy0/example-based/Toy0Ger.gf
diff --git a/examples/regulus/toy0/example-based/Toy0I.gfe b/old-examples/regulus/toy0/example-based/Toy0I.gfe
index 4589bf4b6..4589bf4b6 100644
--- a/examples/regulus/toy0/example-based/Toy0I.gfe
+++ b/old-examples/regulus/toy0/example-based/Toy0I.gfe
diff --git a/examples/regulus/toy0/no-functor/Toy0.gf b/old-examples/regulus/toy0/no-functor/Toy0.gf
index b1e2d6a40..b1e2d6a40 100644
--- a/examples/regulus/toy0/no-functor/Toy0.gf
+++ b/old-examples/regulus/toy0/no-functor/Toy0.gf
diff --git a/examples/regulus/toy0/no-functor/Toy0Eng.gf b/old-examples/regulus/toy0/no-functor/Toy0Eng.gf
index 3bd6613a3..3bd6613a3 100644
--- a/examples/regulus/toy0/no-functor/Toy0Eng.gf
+++ b/old-examples/regulus/toy0/no-functor/Toy0Eng.gf
diff --git a/examples/regulus/toy0/no-functor/Toy0Fin.gf b/old-examples/regulus/toy0/no-functor/Toy0Fin.gf
index 4ebbf6f36..4ebbf6f36 100644
--- a/examples/regulus/toy0/no-functor/Toy0Fin.gf
+++ b/old-examples/regulus/toy0/no-functor/Toy0Fin.gf
diff --git a/examples/regulus/toy0/no-resource/Toy0.gf b/old-examples/regulus/toy0/no-resource/Toy0.gf
index b1e2d6a40..b1e2d6a40 100644
--- a/examples/regulus/toy0/no-resource/Toy0.gf
+++ b/old-examples/regulus/toy0/no-resource/Toy0.gf
diff --git a/examples/regulus/toy0/no-resource/Toy0Eng.gf b/old-examples/regulus/toy0/no-resource/Toy0Eng.gf
index 977fb09c5..977fb09c5 100644
--- a/examples/regulus/toy0/no-resource/Toy0Eng.gf
+++ b/old-examples/regulus/toy0/no-resource/Toy0Eng.gf
diff --git a/examples/regulus/toy0/no-resource/Toy0Fre.gf b/old-examples/regulus/toy0/no-resource/Toy0Fre.gf
index c5267ae18..c5267ae18 100644
--- a/examples/regulus/toy0/no-resource/Toy0Fre.gf
+++ b/old-examples/regulus/toy0/no-resource/Toy0Fre.gf
diff --git a/examples/regulus/toy0/no-resource/Toy0Ger.gf b/old-examples/regulus/toy0/no-resource/Toy0Ger.gf
index 091790f94..091790f94 100644
--- a/examples/regulus/toy0/no-resource/Toy0Ger.gf
+++ b/old-examples/regulus/toy0/no-resource/Toy0Ger.gf
diff --git a/examples/regulus/toy0/no-resource/Toy0_eng.gf b/old-examples/regulus/toy0/no-resource/Toy0_eng.gf
index ed8fe8063..ed8fe8063 100644
--- a/examples/regulus/toy0/no-resource/Toy0_eng.gf
+++ b/old-examples/regulus/toy0/no-resource/Toy0_eng.gf
diff --git a/examples/regulus/toy0/toy0.gfprobs b/old-examples/regulus/toy0/toy0.gfprobs
index 7c97562e2..7c97562e2 100644
--- a/examples/regulus/toy0/toy0.gfprobs
+++ b/old-examples/regulus/toy0/toy0.gfprobs
diff --git a/examples/regulus/toy1/LexToy1.gf b/old-examples/regulus/toy1/LexToy1.gf
index d48e43a3b..d48e43a3b 100644
--- a/examples/regulus/toy1/LexToy1.gf
+++ b/old-examples/regulus/toy1/LexToy1.gf
diff --git a/examples/regulus/toy1/LexToy1Swe.gf b/old-examples/regulus/toy1/LexToy1Swe.gf
index 3930a4728..3930a4728 100644
--- a/examples/regulus/toy1/LexToy1Swe.gf
+++ b/old-examples/regulus/toy1/LexToy1Swe.gf
diff --git a/examples/regulus/toy1/Toy1.gf b/old-examples/regulus/toy1/Toy1.gf
index 49bd320c1..49bd320c1 100644
--- a/examples/regulus/toy1/Toy1.gf
+++ b/old-examples/regulus/toy1/Toy1.gf
diff --git a/examples/regulus/toy1/Toy1Eng.gf b/old-examples/regulus/toy1/Toy1Eng.gf
index 384e50060..384e50060 100644
--- a/examples/regulus/toy1/Toy1Eng.gf
+++ b/old-examples/regulus/toy1/Toy1Eng.gf
diff --git a/examples/regulus/toy1/Toy1Fre.gf b/old-examples/regulus/toy1/Toy1Fre.gf
index c5d903519..c5d903519 100644
--- a/examples/regulus/toy1/Toy1Fre.gf
+++ b/old-examples/regulus/toy1/Toy1Fre.gf
diff --git a/examples/regulus/toy1/Toy1I.gf b/old-examples/regulus/toy1/Toy1I.gf
index eb7a9db7a..eb7a9db7a 100644
--- a/examples/regulus/toy1/Toy1I.gf
+++ b/old-examples/regulus/toy1/Toy1I.gf
diff --git a/examples/regulus/toy1/Toy1Swe.gf b/old-examples/regulus/toy1/Toy1Swe.gf
index 0e23994c8..0e23994c8 100644
--- a/examples/regulus/toy1/Toy1Swe.gf
+++ b/old-examples/regulus/toy1/Toy1Swe.gf
diff --git a/examples/regulus/toy1/Toy1a.gf b/old-examples/regulus/toy1/Toy1a.gf
index cab51455b..cab51455b 100644
--- a/examples/regulus/toy1/Toy1a.gf
+++ b/old-examples/regulus/toy1/Toy1a.gf
diff --git a/examples/regulus/toy1/Toy1aEng.gf b/old-examples/regulus/toy1/Toy1aEng.gf
index d0748cc82..d0748cc82 100644
--- a/examples/regulus/toy1/Toy1aEng.gf
+++ b/old-examples/regulus/toy1/Toy1aEng.gf
diff --git a/examples/restaurant/LexRestaurant.gf b/old-examples/restaurant/LexRestaurant.gf
index fc25d2080..fc25d2080 100644
--- a/examples/restaurant/LexRestaurant.gf
+++ b/old-examples/restaurant/LexRestaurant.gf
diff --git a/examples/restaurant/LexRestaurantEng.gf b/old-examples/restaurant/LexRestaurantEng.gf
index 029144565..029144565 100644
--- a/examples/restaurant/LexRestaurantEng.gf
+++ b/old-examples/restaurant/LexRestaurantEng.gf
diff --git a/examples/restaurant/LexRestaurantFin.gf b/old-examples/restaurant/LexRestaurantFin.gf
index 1755faa5e..1755faa5e 100644
--- a/examples/restaurant/LexRestaurantFin.gf
+++ b/old-examples/restaurant/LexRestaurantFin.gf
diff --git a/examples/restaurant/LexRestaurantGer.gf b/old-examples/restaurant/LexRestaurantGer.gf
index 349a11fd7..349a11fd7 100644
--- a/examples/restaurant/LexRestaurantGer.gf
+++ b/old-examples/restaurant/LexRestaurantGer.gf
diff --git a/examples/restaurant/LexRestaurantSwe.gf b/old-examples/restaurant/LexRestaurantSwe.gf
index 57d4e0487..57d4e0487 100644
--- a/examples/restaurant/LexRestaurantSwe.gf
+++ b/old-examples/restaurant/LexRestaurantSwe.gf
diff --git a/examples/restaurant/Restaurant.gf b/old-examples/restaurant/Restaurant.gf
index 7b0a586de..7b0a586de 100644
--- a/examples/restaurant/Restaurant.gf
+++ b/old-examples/restaurant/Restaurant.gf
diff --git a/examples/restaurant/RestaurantEng.gf b/old-examples/restaurant/RestaurantEng.gf
index a6440219a..a6440219a 100644
--- a/examples/restaurant/RestaurantEng.gf
+++ b/old-examples/restaurant/RestaurantEng.gf
diff --git a/examples/restaurant/RestaurantFin.gf b/old-examples/restaurant/RestaurantFin.gf
index 18aa08ced..18aa08ced 100644
--- a/examples/restaurant/RestaurantFin.gf
+++ b/old-examples/restaurant/RestaurantFin.gf
diff --git a/examples/restaurant/RestaurantGer.gf b/old-examples/restaurant/RestaurantGer.gf
index af711766c..af711766c 100644
--- a/examples/restaurant/RestaurantGer.gf
+++ b/old-examples/restaurant/RestaurantGer.gf
diff --git a/examples/restaurant/RestaurantI.gf b/old-examples/restaurant/RestaurantI.gf
index c84a738ce..c84a738ce 100644
--- a/examples/restaurant/RestaurantI.gf
+++ b/old-examples/restaurant/RestaurantI.gf
diff --git a/examples/restaurant/RestaurantSwe.gf b/old-examples/restaurant/RestaurantSwe.gf
index a8081b7f1..a8081b7f1 100644
--- a/examples/restaurant/RestaurantSwe.gf
+++ b/old-examples/restaurant/RestaurantSwe.gf
diff --git a/examples/shallow/BigShallowEng.gf b/old-examples/shallow/BigShallowEng.gf
index bb83e83fd..bb83e83fd 100644
--- a/examples/shallow/BigShallowEng.gf
+++ b/old-examples/shallow/BigShallowEng.gf
diff --git a/examples/shallow/BigShallowEngAbs.gf b/old-examples/shallow/BigShallowEngAbs.gf
index 06f9e936f..06f9e936f 100644
--- a/examples/shallow/BigShallowEngAbs.gf
+++ b/old-examples/shallow/BigShallowEngAbs.gf
diff --git a/examples/shallow/BigShallowSwe.gf b/old-examples/shallow/BigShallowSwe.gf
index 072516254..072516254 100644
--- a/examples/shallow/BigShallowSwe.gf
+++ b/old-examples/shallow/BigShallowSwe.gf
diff --git a/examples/shallow/BigShallowSweAbs.gf b/old-examples/shallow/BigShallowSweAbs.gf
index a8a39a3e8..a8a39a3e8 100644
--- a/examples/shallow/BigShallowSweAbs.gf
+++ b/old-examples/shallow/BigShallowSweAbs.gf
diff --git a/examples/shallow/README b/old-examples/shallow/README
index 6f4d1838a..6f4d1838a 100644
--- a/examples/shallow/README
+++ b/old-examples/shallow/README
diff --git a/examples/shallow/Shallow.gf b/old-examples/shallow/Shallow.gf
index c521b668e..c521b668e 100644
--- a/examples/shallow/Shallow.gf
+++ b/old-examples/shallow/Shallow.gf
diff --git a/examples/shallow/ShallowEng.gf b/old-examples/shallow/ShallowEng.gf
index eacffefc5..eacffefc5 100644
--- a/examples/shallow/ShallowEng.gf
+++ b/old-examples/shallow/ShallowEng.gf
diff --git a/examples/shallow/ShallowFre.gf b/old-examples/shallow/ShallowFre.gf
index d8b9002cd..d8b9002cd 100644
--- a/examples/shallow/ShallowFre.gf
+++ b/old-examples/shallow/ShallowFre.gf
diff --git a/examples/shallow/ShallowI.gf b/old-examples/shallow/ShallowI.gf
index e8669d9f5..e8669d9f5 100644
--- a/examples/shallow/ShallowI.gf
+++ b/old-examples/shallow/ShallowI.gf
diff --git a/examples/shallow/ShallowSwe.gf b/old-examples/shallow/ShallowSwe.gf
index 9163b575d..9163b575d 100644
--- a/examples/shallow/ShallowSwe.gf
+++ b/old-examples/shallow/ShallowSwe.gf
diff --git a/examples/stoneage/Stoneage.gf b/old-examples/stoneage/Stoneage.gf
index 259ee2e6d..259ee2e6d 100644
--- a/examples/stoneage/Stoneage.gf
+++ b/old-examples/stoneage/Stoneage.gf
diff --git a/examples/stoneage/StoneageEng.gf b/old-examples/stoneage/StoneageEng.gf
index 8adcfe8bc..8adcfe8bc 100644
--- a/examples/stoneage/StoneageEng.gf
+++ b/old-examples/stoneage/StoneageEng.gf
diff --git a/examples/stoneage/StoneageFin.gf b/old-examples/stoneage/StoneageFin.gf
index 2afe3a188..2afe3a188 100644
--- a/examples/stoneage/StoneageFin.gf
+++ b/old-examples/stoneage/StoneageFin.gf
diff --git a/examples/stoneage/StoneageFre.gf b/old-examples/stoneage/StoneageFre.gf
index 766d59071..766d59071 100644
--- a/examples/stoneage/StoneageFre.gf
+++ b/old-examples/stoneage/StoneageFre.gf
diff --git a/examples/stoneage/StoneageIta.gf b/old-examples/stoneage/StoneageIta.gf
index 03c0ccaf1..03c0ccaf1 100644
--- a/examples/stoneage/StoneageIta.gf
+++ b/old-examples/stoneage/StoneageIta.gf
diff --git a/examples/stoneage/StoneageNor.gf b/old-examples/stoneage/StoneageNor.gf
index dba268778..dba268778 100644
--- a/examples/stoneage/StoneageNor.gf
+++ b/old-examples/stoneage/StoneageNor.gf
diff --git a/examples/stoneage/StoneageResEng.gf b/old-examples/stoneage/StoneageResEng.gf
index 544208221..544208221 100644
--- a/examples/stoneage/StoneageResEng.gf
+++ b/old-examples/stoneage/StoneageResEng.gf
diff --git a/examples/stoneage/StoneageResFin.gf b/old-examples/stoneage/StoneageResFin.gf
index f7b47ffe2..f7b47ffe2 100644
--- a/examples/stoneage/StoneageResFin.gf
+++ b/old-examples/stoneage/StoneageResFin.gf
diff --git a/examples/stoneage/StoneageResFre.gf b/old-examples/stoneage/StoneageResFre.gf
index cd5c90a5a..cd5c90a5a 100644
--- a/examples/stoneage/StoneageResFre.gf
+++ b/old-examples/stoneage/StoneageResFre.gf
diff --git a/examples/stoneage/StoneageResIta.gf b/old-examples/stoneage/StoneageResIta.gf
index d8b025004..d8b025004 100644
--- a/examples/stoneage/StoneageResIta.gf
+++ b/old-examples/stoneage/StoneageResIta.gf
diff --git a/examples/stoneage/StoneageResNor.gf b/old-examples/stoneage/StoneageResNor.gf
index 30cd4e092..30cd4e092 100644
--- a/examples/stoneage/StoneageResNor.gf
+++ b/old-examples/stoneage/StoneageResNor.gf
diff --git a/examples/stoneage/StoneageResSpa.gf b/old-examples/stoneage/StoneageResSpa.gf
index c2dd000c6..c2dd000c6 100644
--- a/examples/stoneage/StoneageResSpa.gf
+++ b/old-examples/stoneage/StoneageResSpa.gf
diff --git a/examples/stoneage/StoneageResSwe.gf b/old-examples/stoneage/StoneageResSwe.gf
index 6eb9d1afe..6eb9d1afe 100644
--- a/examples/stoneage/StoneageResSwe.gf
+++ b/old-examples/stoneage/StoneageResSwe.gf
diff --git a/examples/stoneage/StoneageSpa.gf b/old-examples/stoneage/StoneageSpa.gf
index 490ce724d..490ce724d 100644
--- a/examples/stoneage/StoneageSpa.gf
+++ b/old-examples/stoneage/StoneageSpa.gf
diff --git a/examples/stoneage/StoneageSwe.gf b/old-examples/stoneage/StoneageSwe.gf
index 3109db12b..3109db12b 100644
--- a/examples/stoneage/StoneageSwe.gf
+++ b/old-examples/stoneage/StoneageSwe.gf
diff --git a/examples/stoneage/mkStoneage.gfs b/old-examples/stoneage/mkStoneage.gfs
index 824e67310..824e67310 100644
--- a/examples/stoneage/mkStoneage.gfs
+++ b/old-examples/stoneage/mkStoneage.gfs
diff --git a/examples/stoneage1/Stoneage.gf b/old-examples/stoneage1/Stoneage.gf
index a1c03281c..a1c03281c 100644
--- a/examples/stoneage1/Stoneage.gf
+++ b/old-examples/stoneage1/Stoneage.gf
diff --git a/examples/stoneage1/StoneageEng.gf b/old-examples/stoneage1/StoneageEng.gf
index 2d2a166f5..2d2a166f5 100644
--- a/examples/stoneage1/StoneageEng.gf
+++ b/old-examples/stoneage1/StoneageEng.gf
diff --git a/examples/stoneage1/StoneageFin.gf b/old-examples/stoneage1/StoneageFin.gf
index 6a7763bc7..6a7763bc7 100644
--- a/examples/stoneage1/StoneageFin.gf
+++ b/old-examples/stoneage1/StoneageFin.gf
diff --git a/examples/stoneage1/StoneageFre.gf b/old-examples/stoneage1/StoneageFre.gf
index dcd310826..dcd310826 100644
--- a/examples/stoneage1/StoneageFre.gf
+++ b/old-examples/stoneage1/StoneageFre.gf
diff --git a/examples/stoneage1/StoneageGer.gf b/old-examples/stoneage1/StoneageGer.gf
index b7a896770..b7a896770 100644
--- a/examples/stoneage1/StoneageGer.gf
+++ b/old-examples/stoneage1/StoneageGer.gf
diff --git a/examples/stoneage1/StoneageI.gf b/old-examples/stoneage1/StoneageI.gf
index 50a76c9e4..50a76c9e4 100644
--- a/examples/stoneage1/StoneageI.gf
+++ b/old-examples/stoneage1/StoneageI.gf
diff --git a/examples/stoneage1/StoneageIta.gf b/old-examples/stoneage1/StoneageIta.gf
index 8cf815f15..8cf815f15 100644
--- a/examples/stoneage1/StoneageIta.gf
+++ b/old-examples/stoneage1/StoneageIta.gf
diff --git a/examples/stoneage1/StoneageNor.gf b/old-examples/stoneage1/StoneageNor.gf
index 86a88f995..86a88f995 100644
--- a/examples/stoneage1/StoneageNor.gf
+++ b/old-examples/stoneage1/StoneageNor.gf
diff --git a/examples/stoneage1/StoneageSpa.gf b/old-examples/stoneage1/StoneageSpa.gf
index 73cb60e21..73cb60e21 100644
--- a/examples/stoneage1/StoneageSpa.gf
+++ b/old-examples/stoneage1/StoneageSpa.gf
diff --git a/examples/stoneage1/StoneageSwe.gf b/old-examples/stoneage1/StoneageSwe.gf
index b8383ba8e..b8383ba8e 100644
--- a/examples/stoneage1/StoneageSwe.gf
+++ b/old-examples/stoneage1/StoneageSwe.gf
diff --git a/examples/systemS/Formula.gf b/old-examples/systemS/Formula.gf
index 62bc67eb7..62bc67eb7 100644
--- a/examples/systemS/Formula.gf
+++ b/old-examples/systemS/Formula.gf
diff --git a/examples/systemS/FormulaSymb.gf b/old-examples/systemS/FormulaSymb.gf
index 5c2360673..5c2360673 100644
--- a/examples/systemS/FormulaSymb.gf
+++ b/old-examples/systemS/FormulaSymb.gf
diff --git a/examples/systemS/Precedence.gf b/old-examples/systemS/Precedence.gf
index 7defd19aa..7defd19aa 100644
--- a/examples/systemS/Precedence.gf
+++ b/old-examples/systemS/Precedence.gf
diff --git a/examples/systemS/Proof.gf b/old-examples/systemS/Proof.gf
index 06a6f1c68..06a6f1c68 100644
--- a/examples/systemS/Proof.gf
+++ b/old-examples/systemS/Proof.gf
diff --git a/examples/systemS/ProofEng.gf b/old-examples/systemS/ProofEng.gf
index 612e228c8..612e228c8 100644
--- a/examples/systemS/ProofEng.gf
+++ b/old-examples/systemS/ProofEng.gf
diff --git a/examples/systemS/ProofSymb.gf b/old-examples/systemS/ProofSymb.gf
index 3de1b91b7..3de1b91b7 100644
--- a/examples/systemS/ProofSymb.gf
+++ b/old-examples/systemS/ProofSymb.gf
diff --git a/examples/systemS/README b/old-examples/systemS/README
index ebbd92ce6..ebbd92ce6 100644
--- a/examples/systemS/README
+++ b/old-examples/systemS/README
diff --git a/examples/systemS/ex1.txt b/old-examples/systemS/ex1.txt
index d62b5882b..d62b5882b 100644
--- a/examples/systemS/ex1.txt
+++ b/old-examples/systemS/ex1.txt
diff --git a/examples/systemS/ex1eng.txt b/old-examples/systemS/ex1eng.txt
index 255440486..255440486 100644
--- a/examples/systemS/ex1eng.txt
+++ b/old-examples/systemS/ex1eng.txt
diff --git a/examples/systemS/ex2.txt b/old-examples/systemS/ex2.txt
index 1dffb6bf9..1dffb6bf9 100644
--- a/examples/systemS/ex2.txt
+++ b/old-examples/systemS/ex2.txt
diff --git a/examples/systemS/ex2eng.txt b/old-examples/systemS/ex2eng.txt
index f1ef836ae..f1ef836ae 100644
--- a/examples/systemS/ex2eng.txt
+++ b/old-examples/systemS/ex2eng.txt
diff --git a/examples/systemS/ex4.txt b/old-examples/systemS/ex4.txt
index 7a91011da..7a91011da 100644
--- a/examples/systemS/ex4.txt
+++ b/old-examples/systemS/ex4.txt
diff --git a/examples/systemS/ex4eng.txt b/old-examples/systemS/ex4eng.txt
index 3ad4f3549..3ad4f3549 100644
--- a/examples/systemS/ex4eng.txt
+++ b/old-examples/systemS/ex4eng.txt
diff --git a/examples/systemS/proof.gfcm b/old-examples/systemS/proof.gfcm
index 6e9692769..6e9692769 100644
--- a/examples/systemS/proof.gfcm
+++ b/old-examples/systemS/proof.gfcm
diff --git a/examples/systemS/test.gfs b/old-examples/systemS/test.gfs
index db5e64cbf..db5e64cbf 100644
--- a/examples/systemS/test.gfs
+++ b/old-examples/systemS/test.gfs
diff --git a/examples/tram/ExTramI.gfe b/old-examples/tram/ExTramI.gfe
index f1a07af09..f1a07af09 100644
--- a/examples/tram/ExTramI.gfe
+++ b/old-examples/tram/ExTramI.gfe
diff --git a/examples/tram/README b/old-examples/tram/README
index c4f606380..c4f606380 100644
--- a/examples/tram/README
+++ b/old-examples/tram/README
diff --git a/examples/tram/Tram.gf b/old-examples/tram/Tram.gf
index 5392d1c73..5392d1c73 100644
--- a/examples/tram/Tram.gf
+++ b/old-examples/tram/Tram.gf
diff --git a/examples/tram/TramEng.gf b/old-examples/tram/TramEng.gf
index ce2f4e845..ce2f4e845 100644
--- a/examples/tram/TramEng.gf
+++ b/old-examples/tram/TramEng.gf
diff --git a/examples/tram/TramFin.gf b/old-examples/tram/TramFin.gf
index ae7a7e4ad..ae7a7e4ad 100644
--- a/examples/tram/TramFin.gf
+++ b/old-examples/tram/TramFin.gf
diff --git a/examples/tram/TramFre.gf b/old-examples/tram/TramFre.gf
index 43039e420..43039e420 100644
--- a/examples/tram/TramFre.gf
+++ b/old-examples/tram/TramFre.gf
diff --git a/examples/tram/TramGer.gf b/old-examples/tram/TramGer.gf
index 678974a52..678974a52 100644
--- a/examples/tram/TramGer.gf
+++ b/old-examples/tram/TramGer.gf
diff --git a/examples/tram/TramI.gf b/old-examples/tram/TramI.gf
index 31dbaab59..31dbaab59 100644
--- a/examples/tram/TramI.gf
+++ b/old-examples/tram/TramI.gf
diff --git a/examples/tram/TramIta.gf b/old-examples/tram/TramIta.gf
index 581ab6ad1..581ab6ad1 100644
--- a/examples/tram/TramIta.gf
+++ b/old-examples/tram/TramIta.gf
diff --git a/examples/tram/TramNor.gf b/old-examples/tram/TramNor.gf
index 70392de35..70392de35 100644
--- a/examples/tram/TramNor.gf
+++ b/old-examples/tram/TramNor.gf
diff --git a/examples/tram/TramSpa.gf b/old-examples/tram/TramSpa.gf
index 822adad9d..822adad9d 100644
--- a/examples/tram/TramSpa.gf
+++ b/old-examples/tram/TramSpa.gf
diff --git a/examples/tram/TramSwe.gf b/old-examples/tram/TramSwe.gf
index 98886d5c5..98886d5c5 100644
--- a/examples/tram/TramSwe.gf
+++ b/old-examples/tram/TramSwe.gf
diff --git a/examples/tram0/README b/old-examples/tram0/README
index 552b160f3..552b160f3 100644
--- a/examples/tram0/README
+++ b/old-examples/tram0/README
diff --git a/examples/tram0/Tram.gf b/old-examples/tram0/Tram.gf
index bcd9f7b7c..bcd9f7b7c 100644
--- a/examples/tram0/Tram.gf
+++ b/old-examples/tram0/Tram.gf
diff --git a/examples/tram0/TramEng.gf b/old-examples/tram0/TramEng.gf
index 58a7bd8de..58a7bd8de 100644
--- a/examples/tram0/TramEng.gf
+++ b/old-examples/tram0/TramEng.gf
diff --git a/examples/tram0/TramFre.gf b/old-examples/tram0/TramFre.gf
index 4d6909640..4d6909640 100644
--- a/examples/tram0/TramFre.gf
+++ b/old-examples/tram0/TramFre.gf
diff --git a/examples/tram0/TramI.gf b/old-examples/tram0/TramI.gf
index 384cdbf3b..384cdbf3b 100644
--- a/examples/tram0/TramI.gf
+++ b/old-examples/tram0/TramI.gf
diff --git a/examples/tram0/TramSwe.gf b/old-examples/tram0/TramSwe.gf
index 6875fafa2..6875fafa2 100644
--- a/examples/tram0/TramSwe.gf
+++ b/old-examples/tram0/TramSwe.gf
diff --git a/examples/travel/Essential.gf b/old-examples/travel/Essential.gf
index f90dc45b6..f90dc45b6 100644
--- a/examples/travel/Essential.gf
+++ b/old-examples/travel/Essential.gf
diff --git a/examples/travel/EssentialThai.gf b/old-examples/travel/EssentialThai.gf
index 25255b9a5..25255b9a5 100644
--- a/examples/travel/EssentialThai.gf
+++ b/old-examples/travel/EssentialThai.gf
diff --git a/examples/travel/Travel.gf b/old-examples/travel/Travel.gf
index 77e2ec234..77e2ec234 100644
--- a/examples/travel/Travel.gf
+++ b/old-examples/travel/Travel.gf
diff --git a/examples/travel/TravelTha.gf b/old-examples/travel/TravelTha.gf
index 882745bef..882745bef 100644
--- a/examples/travel/TravelTha.gf
+++ b/old-examples/travel/TravelTha.gf
diff --git a/examples/travel/TravelThai.gf b/old-examples/travel/TravelThai.gf
index 925fd3903..925fd3903 100644
--- a/examples/travel/TravelThai.gf
+++ b/old-examples/travel/TravelThai.gf
diff --git a/examples/travel/TravelThaiPron.gf b/old-examples/travel/TravelThaiPron.gf
index b152c4d2a..b152c4d2a 100644
--- a/examples/travel/TravelThaiPron.gf
+++ b/old-examples/travel/TravelThaiPron.gf
diff --git a/examples-3.0/tutorial/calculator/Calculator.gf b/old-examples/tutorial/calculator/Calculator.gf
index 65192e226..65192e226 100644
--- a/examples-3.0/tutorial/calculator/Calculator.gf
+++ b/old-examples/tutorial/calculator/Calculator.gf
diff --git a/examples-3.0/tutorial/calculator/CalculatorC.gf b/old-examples/tutorial/calculator/CalculatorC.gf
index 53eade357..53eade357 100644
--- a/examples-3.0/tutorial/calculator/CalculatorC.gf
+++ b/old-examples/tutorial/calculator/CalculatorC.gf
diff --git a/examples-3.0/tutorial/calculator/CalculatorE.gf b/old-examples/tutorial/calculator/CalculatorE.gf
index f432d371a..f432d371a 100644
--- a/examples-3.0/tutorial/calculator/CalculatorE.gf
+++ b/old-examples/tutorial/calculator/CalculatorE.gf
diff --git a/examples-3.0/tutorial/calculator/CalculatorJ.gf b/old-examples/tutorial/calculator/CalculatorJ.gf
index 68ff5342c..68ff5342c 100644
--- a/examples-3.0/tutorial/calculator/CalculatorJ.gf
+++ b/old-examples/tutorial/calculator/CalculatorJ.gf
diff --git a/examples-3.0/tutorial/calculator/CalculatorP.gf b/old-examples/tutorial/calculator/CalculatorP.gf
index 57ac549c1..57ac549c1 100644
--- a/examples-3.0/tutorial/calculator/CalculatorP.gf
+++ b/old-examples/tutorial/calculator/CalculatorP.gf
diff --git a/examples/tutorial/embedded/LexMath.gf b/old-examples/tutorial/embedded/LexMath.gf
index 25bfe8846..25bfe8846 100644
--- a/examples/tutorial/embedded/LexMath.gf
+++ b/old-examples/tutorial/embedded/LexMath.gf
diff --git a/examples/tutorial/embedded/LexMathEng.gf b/old-examples/tutorial/embedded/LexMathEng.gf
index 183fa520f..183fa520f 100644
--- a/examples/tutorial/embedded/LexMathEng.gf
+++ b/old-examples/tutorial/embedded/LexMathEng.gf
diff --git a/examples/tutorial/embedded/LexMathFre.gf b/old-examples/tutorial/embedded/LexMathFre.gf
index 7407b410f..7407b410f 100644
--- a/examples/tutorial/embedded/LexMathFre.gf
+++ b/old-examples/tutorial/embedded/LexMathFre.gf
diff --git a/examples/tutorial/embedded/Makefile b/old-examples/tutorial/embedded/Makefile
index 119d5d0fe..119d5d0fe 100644
--- a/examples/tutorial/embedded/Makefile
+++ b/old-examples/tutorial/embedded/Makefile
diff --git a/examples/tutorial/embedded/Math.gf b/old-examples/tutorial/embedded/Math.gf
index 95f5d5d1c..95f5d5d1c 100644
--- a/examples/tutorial/embedded/Math.gf
+++ b/old-examples/tutorial/embedded/Math.gf
diff --git a/examples/tutorial/embedded/MathEng.gf b/old-examples/tutorial/embedded/MathEng.gf
index ac332fef7..ac332fef7 100644
--- a/examples/tutorial/embedded/MathEng.gf
+++ b/old-examples/tutorial/embedded/MathEng.gf
diff --git a/examples/tutorial/embedded/MathFre.gf b/old-examples/tutorial/embedded/MathFre.gf
index 456db8084..456db8084 100644
--- a/examples/tutorial/embedded/MathFre.gf
+++ b/old-examples/tutorial/embedded/MathFre.gf
diff --git a/examples/tutorial/embedded/MathI.gf b/old-examples/tutorial/embedded/MathI.gf
index aaac7b98f..aaac7b98f 100644
--- a/examples/tutorial/embedded/MathI.gf
+++ b/old-examples/tutorial/embedded/MathI.gf
diff --git a/examples/tutorial/embedded/TransferDef.hs b/old-examples/tutorial/embedded/TransferDef.hs
index 8be39107d..8be39107d 100644
--- a/examples/tutorial/embedded/TransferDef.hs
+++ b/old-examples/tutorial/embedded/TransferDef.hs
diff --git a/examples/tutorial/embedded/TransferLoop.hs b/old-examples/tutorial/embedded/TransferLoop.hs
index 708578156..708578156 100644
--- a/examples/tutorial/embedded/TransferLoop.hs
+++ b/old-examples/tutorial/embedded/TransferLoop.hs
diff --git a/examples/tutorial/embedded/Translator.hs b/old-examples/tutorial/embedded/Translator.hs
index c227420f6..c227420f6 100644
--- a/examples/tutorial/embedded/Translator.hs
+++ b/old-examples/tutorial/embedded/Translator.hs
diff --git a/examples/tutorial/embedded/TranslatorLoop.hs b/old-examples/tutorial/embedded/TranslatorLoop.hs
index 18b20146e..18b20146e 100644
--- a/examples/tutorial/embedded/TranslatorLoop.hs
+++ b/old-examples/tutorial/embedded/TranslatorLoop.hs
diff --git a/examples/tutorial/embedded/haskell/GSyntax.hs b/old-examples/tutorial/embedded/haskell/GSyntax.hs
index 28469e7da..28469e7da 100644
--- a/examples/tutorial/embedded/haskell/GSyntax.hs
+++ b/old-examples/tutorial/embedded/haskell/GSyntax.hs
diff --git a/examples/tutorial/embedded/haskell/Run.hs b/old-examples/tutorial/embedded/haskell/Run.hs
index c3fd87466..c3fd87466 100644
--- a/examples/tutorial/embedded/haskell/Run.hs
+++ b/old-examples/tutorial/embedded/haskell/Run.hs
diff --git a/examples-3.0/tutorial/food/Food.gf b/old-examples/tutorial/food/Food.gf
index c4efd5950..c4efd5950 100644
--- a/examples-3.0/tutorial/food/Food.gf
+++ b/old-examples/tutorial/food/Food.gf
diff --git a/examples-3.0/tutorial/food/FoodEng.gf b/old-examples/tutorial/food/FoodEng.gf
index a4f5907be..a4f5907be 100644
--- a/examples-3.0/tutorial/food/FoodEng.gf
+++ b/old-examples/tutorial/food/FoodEng.gf
diff --git a/examples-3.0/tutorial/food/FoodIta.gf b/old-examples/tutorial/food/FoodIta.gf
index fc59e1294..fc59e1294 100644
--- a/examples-3.0/tutorial/food/FoodIta.gf
+++ b/old-examples/tutorial/food/FoodIta.gf
diff --git a/examples/tutorial/food/food.ebnf b/old-examples/tutorial/food/food.ebnf
index d85739dad..d85739dad 100644
--- a/examples/tutorial/food/food.ebnf
+++ b/old-examples/tutorial/food/food.ebnf
diff --git a/examples-3.0/tutorial/foods/Foods.gf b/old-examples/tutorial/foods/Foods.gf
index 35779a76d..35779a76d 100644
--- a/examples-3.0/tutorial/foods/Foods.gf
+++ b/old-examples/tutorial/foods/Foods.gf
diff --git a/examples-3.0/tutorial/foods/FoodsEng.gf b/old-examples/tutorial/foods/FoodsEng.gf
index 69a427006..69a427006 100644
--- a/examples-3.0/tutorial/foods/FoodsEng.gf
+++ b/old-examples/tutorial/foods/FoodsEng.gf
diff --git a/examples-3.0/tutorial/foods/FoodsIta.gf b/old-examples/tutorial/foods/FoodsIta.gf
index 0099058d0..0099058d0 100644
--- a/examples-3.0/tutorial/foods/FoodsIta.gf
+++ b/old-examples/tutorial/foods/FoodsIta.gf
diff --git a/examples-3.0/tutorial/hello/Hello.gf b/old-examples/tutorial/hello/Hello.gf
index 769be5cbf..769be5cbf 100644
--- a/examples-3.0/tutorial/hello/Hello.gf
+++ b/old-examples/tutorial/hello/Hello.gf
diff --git a/examples-3.0/tutorial/hello/HelloEng.gf b/old-examples/tutorial/hello/HelloEng.gf
index 69efba6b4..69efba6b4 100644
--- a/examples-3.0/tutorial/hello/HelloEng.gf
+++ b/old-examples/tutorial/hello/HelloEng.gf
diff --git a/examples-3.0/tutorial/hello/HelloFin.gf b/old-examples/tutorial/hello/HelloFin.gf
index 969142a91..969142a91 100644
--- a/examples-3.0/tutorial/hello/HelloFin.gf
+++ b/old-examples/tutorial/hello/HelloFin.gf
diff --git a/examples-3.0/tutorial/hello/HelloIta.gf b/old-examples/tutorial/hello/HelloIta.gf
index f1465a867..f1465a867 100644
--- a/examples-3.0/tutorial/hello/HelloIta.gf
+++ b/old-examples/tutorial/hello/HelloIta.gf
diff --git a/examples-3.0/tutorial/hello/hello.gfs b/old-examples/tutorial/hello/hello.gfs
index 3a18fee52..783919e0e 100644
--- a/examples-3.0/tutorial/hello/hello.gfs
+++ b/old-examples/tutorial/hello/hello.gfs
@@ -1,4 +1,4 @@
 import HelloEng.gf
 import HelloFin.gf
 import HelloIta.gf
-linearize Hello World
+linearize -multi Hello World
diff --git a/examples-3.0/tutorial/resource-foods/ExtFoods.gf b/old-examples/tutorial/resource-foods/ExtFoods.gf
index 22b65a3c0..22b65a3c0 100644
--- a/examples-3.0/tutorial/resource-foods/ExtFoods.gf
+++ b/old-examples/tutorial/resource-foods/ExtFoods.gf
diff --git a/examples-3.0/tutorial/resource-foods/ExtFoodsEng.gf b/old-examples/tutorial/resource-foods/ExtFoodsEng.gf
index 70ba26b74..70ba26b74 100644
--- a/examples-3.0/tutorial/resource-foods/ExtFoodsEng.gf
+++ b/old-examples/tutorial/resource-foods/ExtFoodsEng.gf
diff --git a/examples-3.0/tutorial/resource-foods/ExtFoodsFin.gf b/old-examples/tutorial/resource-foods/ExtFoodsFin.gf
index 9cf90dfa0..9cf90dfa0 100644
--- a/examples-3.0/tutorial/resource-foods/ExtFoodsFin.gf
+++ b/old-examples/tutorial/resource-foods/ExtFoodsFin.gf
diff --git a/examples-3.0/tutorial/resource-foods/ExtFoodsGer.gf b/old-examples/tutorial/resource-foods/ExtFoodsGer.gf
index 62285e3ae..62285e3ae 100644
--- a/examples-3.0/tutorial/resource-foods/ExtFoodsGer.gf
+++ b/old-examples/tutorial/resource-foods/ExtFoodsGer.gf
diff --git a/examples-3.0/tutorial/resource-foods/ExtFoodsI.gf b/old-examples/tutorial/resource-foods/ExtFoodsI.gf
index 586f3e42b..586f3e42b 100644
--- a/examples-3.0/tutorial/resource-foods/ExtFoodsI.gf
+++ b/old-examples/tutorial/resource-foods/ExtFoodsI.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsEng.gf b/old-examples/tutorial/resource-foods/FoodsEng.gf
index 90ae07f01..90ae07f01 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsEng.gf
+++ b/old-examples/tutorial/resource-foods/FoodsEng.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsEni.gf b/old-examples/tutorial/resource-foods/FoodsEni.gf
index cf1156ea6..cf1156ea6 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsEni.gf
+++ b/old-examples/tutorial/resource-foods/FoodsEni.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsFin.gf b/old-examples/tutorial/resource-foods/FoodsFin.gf
index 2c76ee4a0..2c76ee4a0 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsFin.gf
+++ b/old-examples/tutorial/resource-foods/FoodsFin.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsFre.gf b/old-examples/tutorial/resource-foods/FoodsFre.gf
index f10a60e63..f10a60e63 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsFre.gf
+++ b/old-examples/tutorial/resource-foods/FoodsFre.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsGer.gf b/old-examples/tutorial/resource-foods/FoodsGer.gf
index 1c5090ff6..1c5090ff6 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsGer.gf
+++ b/old-examples/tutorial/resource-foods/FoodsGer.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsI.gf b/old-examples/tutorial/resource-foods/FoodsI.gf
index e19e3c6a4..e19e3c6a4 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsI.gf
+++ b/old-examples/tutorial/resource-foods/FoodsI.gf
diff --git a/examples-3.0/tutorial/resource-foods/FoodsIta.gf b/old-examples/tutorial/resource-foods/FoodsIta.gf
index 7158d77f9..7158d77f9 100644
--- a/examples-3.0/tutorial/resource-foods/FoodsIta.gf
+++ b/old-examples/tutorial/resource-foods/FoodsIta.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoods.gf b/old-examples/tutorial/resource-foods/LexFoods.gf
index 875427b77..875427b77 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoods.gf
+++ b/old-examples/tutorial/resource-foods/LexFoods.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoodsEng.gf b/old-examples/tutorial/resource-foods/LexFoodsEng.gf
index 01024b356..01024b356 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoodsEng.gf
+++ b/old-examples/tutorial/resource-foods/LexFoodsEng.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoodsFin.gf b/old-examples/tutorial/resource-foods/LexFoodsFin.gf
index 513c541b4..513c541b4 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoodsFin.gf
+++ b/old-examples/tutorial/resource-foods/LexFoodsFin.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoodsFre.gf b/old-examples/tutorial/resource-foods/LexFoodsFre.gf
index 5e7f72442..5e7f72442 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoodsFre.gf
+++ b/old-examples/tutorial/resource-foods/LexFoodsFre.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoodsGer.gf b/old-examples/tutorial/resource-foods/LexFoodsGer.gf
index 15c5d94ca..15c5d94ca 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoodsGer.gf
+++ b/old-examples/tutorial/resource-foods/LexFoodsGer.gf
diff --git a/examples-3.0/tutorial/resource-foods/LexFoodsIta.gf b/old-examples/tutorial/resource-foods/LexFoodsIta.gf
index be120a24e..be120a24e 100644
--- a/examples-3.0/tutorial/resource-foods/LexFoodsIta.gf
+++ b/old-examples/tutorial/resource-foods/LexFoodsIta.gf
diff --git a/examples-3.0/tutorial/semantics/Answer.hs b/old-examples/tutorial/semantics/Answer.hs
index 08a76c5f1..08a76c5f1 100644
--- a/examples-3.0/tutorial/semantics/Answer.hs
+++ b/old-examples/tutorial/semantics/Answer.hs
diff --git a/examples-3.0/tutorial/semantics/AnswerBase.hs b/old-examples/tutorial/semantics/AnswerBase.hs
index 56e2b5451..56e2b5451 100644
--- a/examples-3.0/tutorial/semantics/AnswerBase.hs
+++ b/old-examples/tutorial/semantics/AnswerBase.hs
diff --git a/examples-3.0/tutorial/semantics/Base.gf b/old-examples/tutorial/semantics/Base.gf
index 85868d7ac..4586c3106 100644
--- a/examples-3.0/tutorial/semantics/Base.gf
+++ b/old-examples/tutorial/semantics/Base.gf
@@ -30,7 +30,7 @@ fun
 
 -- lexicon
 
-  UseInt : Int -> PN ;
+  UseInt  : Int -> PN ;
 
   Number : CN ;
   Even, Odd, Prime : AP ;
diff --git a/examples-3.0/tutorial/semantics/BaseEng.gf b/old-examples/tutorial/semantics/BaseEng.gf
index bd79bc98c..bd79bc98c 100644
--- a/examples-3.0/tutorial/semantics/BaseEng.gf
+++ b/old-examples/tutorial/semantics/BaseEng.gf
diff --git a/examples-3.0/tutorial/semantics/BaseI.gf b/old-examples/tutorial/semantics/BaseI.gf
index b7ed86666..ec967e443 100644
--- a/examples-3.0/tutorial/semantics/BaseI.gf
+++ b/old-examples/tutorial/semantics/BaseI.gf
@@ -32,7 +32,7 @@ lin
   And = and_Conj ;
   Or  = or_Conj ;
 
-  UseInt i = symb (i ** {lock_Int = <>}) ; ---- terrible to need this
+  UseInt i = symb i ;
 
   Number = mkCN number_N ;
 
@@ -46,15 +46,15 @@ lin
  
   Sum     = prefix sum_N2 ;
   Product = prefix product_N2 ;
-  GCD nps = mkNP (mkDet DefArt (mkOrd great_A)) 
+  GCD nps = mkNP (mkDet (mkQuantSg defQuant) (mkOrd great_A)) 
               (mkCN common_A (mkCN divisor_N2 (mkNP and_Conj nps))) ;
 
   WhatIs np = mkPhr (mkQS (mkQCl whatSg_IP (mkVP np))) ;
-  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP which_IQuant cn) (mkVP ap))) ;
+  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP whichPl_IDet cn) (mkVP ap))) ;
   QuestS s = mkPhr (mkQS (mkQCl s)) ;
 
-  Yes = mkPhr yes_Utt ;
-  No = mkPhr no_Utt ;
+  Yes = yes_Phr ;
+  No = no_Phr ;
 
   Value np = mkPhr (mkUtt np) ;
   Many list = mkNP and_Conj list ;
@@ -65,6 +65,6 @@ lin
 
 oper
   prefix : G.N2 -> G.ListNP -> G.NP = \n2,nps -> 
-    mkNP DefArt (mkCN n2 (mkNP and_Conj nps)) ;
+    mkNP defSgDet (mkCN n2 (mkNP and_Conj nps)) ;
   
 }
diff --git a/examples-3.0/tutorial/semantics/BaseIEng.gf b/old-examples/tutorial/semantics/BaseIEng.gf
index a73bd44c6..a73bd44c6 100644
--- a/examples-3.0/tutorial/semantics/BaseIEng.gf
+++ b/old-examples/tutorial/semantics/BaseIEng.gf
diff --git a/examples-3.0/tutorial/semantics/BaseSwe.gf b/old-examples/tutorial/semantics/BaseSwe.gf
index 6329c1c9c..6329c1c9c 100644
--- a/examples-3.0/tutorial/semantics/BaseSwe.gf
+++ b/old-examples/tutorial/semantics/BaseSwe.gf
diff --git a/examples/tutorial/semantics/Core.gf b/old-examples/tutorial/semantics/Core.gf
index 975cf827f..975cf827f 100644
--- a/examples/tutorial/semantics/Core.gf
+++ b/old-examples/tutorial/semantics/Core.gf
diff --git a/examples-3.0/tutorial/semantics/GSyntax.hs b/old-examples/tutorial/semantics/GSyntax.hs
index 6c67e40aa..6c67e40aa 100644
--- a/examples-3.0/tutorial/semantics/GSyntax.hs
+++ b/old-examples/tutorial/semantics/GSyntax.hs
diff --git a/examples-3.0/tutorial/semantics/LexBase.gf b/old-examples/tutorial/semantics/LexBase.gf
index 83713a35f..83713a35f 100644
--- a/examples-3.0/tutorial/semantics/LexBase.gf
+++ b/old-examples/tutorial/semantics/LexBase.gf
diff --git a/examples-3.0/tutorial/semantics/LexBaseEng.gf b/old-examples/tutorial/semantics/LexBaseEng.gf
index aea3a838b..aea3a838b 100644
--- a/examples-3.0/tutorial/semantics/LexBaseEng.gf
+++ b/old-examples/tutorial/semantics/LexBaseEng.gf
diff --git a/examples-3.0/tutorial/semantics/LexBaseSwe.gf b/old-examples/tutorial/semantics/LexBaseSwe.gf
index 6ac1904aa..6ac1904aa 100644
--- a/examples-3.0/tutorial/semantics/LexBaseSwe.gf
+++ b/old-examples/tutorial/semantics/LexBaseSwe.gf
diff --git a/examples-3.0/tutorial/semantics/Logic.hs b/old-examples/tutorial/semantics/Logic.hs
index b5c615da5..b5c615da5 100644
--- a/examples-3.0/tutorial/semantics/Logic.hs
+++ b/old-examples/tutorial/semantics/Logic.hs
diff --git a/examples-3.0/tutorial/semantics/SemBase.hs b/old-examples/tutorial/semantics/SemBase.hs
index 24073894b..24073894b 100644
--- a/examples-3.0/tutorial/semantics/SemBase.hs
+++ b/old-examples/tutorial/semantics/SemBase.hs
diff --git a/examples-3.0/tutorial/semantics/Top.hs b/old-examples/tutorial/semantics/Top.hs
index 6027b238c..6027b238c 100644
--- a/examples-3.0/tutorial/semantics/Top.hs
+++ b/old-examples/tutorial/semantics/Top.hs
diff --git a/examples-3.0/tutorial/smart/House.gf b/old-examples/tutorial/smart/House.gf
index e156792f1..e156792f1 100644
--- a/examples-3.0/tutorial/smart/House.gf
+++ b/old-examples/tutorial/smart/House.gf
diff --git a/examples-3.0/tutorial/smart/HouseEng.gf b/old-examples/tutorial/smart/HouseEng.gf
index d36122c51..d36122c51 100644
--- a/examples-3.0/tutorial/smart/HouseEng.gf
+++ b/old-examples/tutorial/smart/HouseEng.gf
diff --git a/examples-3.0/tutorial/smart/LexSmart.gf b/old-examples/tutorial/smart/LexSmart.gf
index 0bbe7aa7c..0bbe7aa7c 100644
--- a/examples-3.0/tutorial/smart/LexSmart.gf
+++ b/old-examples/tutorial/smart/LexSmart.gf
diff --git a/examples-3.0/tutorial/smart/LexSmartSwe.gf b/old-examples/tutorial/smart/LexSmartSwe.gf
index 6a9ea38ef..6a9ea38ef 100644
--- a/examples-3.0/tutorial/smart/LexSmartSwe.gf
+++ b/old-examples/tutorial/smart/LexSmartSwe.gf
diff --git a/examples-3.0/tutorial/smart/Smart.gf b/old-examples/tutorial/smart/Smart.gf
index f88b40f12..f88b40f12 100644
--- a/examples-3.0/tutorial/smart/Smart.gf
+++ b/old-examples/tutorial/smart/Smart.gf
diff --git a/examples-3.0/tutorial/smart/SmartEng.gf b/old-examples/tutorial/smart/SmartEng.gf
index eff8a000a..384e50060 100644
--- a/examples-3.0/tutorial/smart/SmartEng.gf
+++ b/old-examples/tutorial/smart/SmartEng.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete SmartEng of Smart = open Prelude in {
+concrete Toy1Eng of Toy1 = open Prelude in {
 
 -- grammar Toy1 from the Regulus book
 
diff --git a/examples-3.0/tutorial/smart/SmartFre.gf b/old-examples/tutorial/smart/SmartFre.gf
index 95b219b60..c5d903519 100644
--- a/examples-3.0/tutorial/smart/SmartFre.gf
+++ b/old-examples/tutorial/smart/SmartFre.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete SmartFre of Smart = open Prelude in {
+concrete Toy1Fre of Toy1 = open Prelude in {
 
 -- grammar Toy1 from the Regulus book
 
diff --git a/examples-3.0/tutorial/smart/SmartI.gf b/old-examples/tutorial/smart/SmartI.gf
index 2b46ba0fe..2b46ba0fe 100644
--- a/examples-3.0/tutorial/smart/SmartI.gf
+++ b/old-examples/tutorial/smart/SmartI.gf
diff --git a/examples-3.0/tutorial/smart/SmartSwe.gf b/old-examples/tutorial/smart/SmartSwe.gf
index a537639d6..a537639d6 100644
--- a/examples-3.0/tutorial/smart/SmartSwe.gf
+++ b/old-examples/tutorial/smart/SmartSwe.gf
diff --git a/examples/tutorial/syntax/FoodsEng.gf b/old-examples/tutorial/syntax/FoodsEng.gf
index fb8c44610..fb8c44610 100644
--- a/examples/tutorial/syntax/FoodsEng.gf
+++ b/old-examples/tutorial/syntax/FoodsEng.gf
diff --git a/examples/tutorial/syntax/FoodsI.gf b/old-examples/tutorial/syntax/FoodsI.gf
index d67302235..d67302235 100644
--- a/examples/tutorial/syntax/FoodsI.gf
+++ b/old-examples/tutorial/syntax/FoodsI.gf
diff --git a/examples/tutorial/syntax/FoodsIta.gf b/old-examples/tutorial/syntax/FoodsIta.gf
index 57beab918..57beab918 100644
--- a/examples/tutorial/syntax/FoodsIta.gf
+++ b/old-examples/tutorial/syntax/FoodsIta.gf
diff --git a/examples-3.0/tutorial/syntax/Grammar.gf b/old-examples/tutorial/syntax/Grammar.gf
index c48e89a21..c48e89a21 100644
--- a/examples-3.0/tutorial/syntax/Grammar.gf
+++ b/old-examples/tutorial/syntax/Grammar.gf
diff --git a/examples-3.0/tutorial/syntax/GrammarEng.gf b/old-examples/tutorial/syntax/GrammarEng.gf
index 4b4c53a73..4b4c53a73 100644
--- a/examples-3.0/tutorial/syntax/GrammarEng.gf
+++ b/old-examples/tutorial/syntax/GrammarEng.gf
diff --git a/examples-3.0/tutorial/syntax/GrammarIta.gf b/old-examples/tutorial/syntax/GrammarIta.gf
index 04b112ed9..04b112ed9 100644
--- a/examples-3.0/tutorial/syntax/GrammarIta.gf
+++ b/old-examples/tutorial/syntax/GrammarIta.gf
diff --git a/examples-3.0/tutorial/syntax/MorphoEng.gf b/old-examples/tutorial/syntax/MorphoEng.gf
index b2255d0d4..b2255d0d4 100644
--- a/examples-3.0/tutorial/syntax/MorphoEng.gf
+++ b/old-examples/tutorial/syntax/MorphoEng.gf
diff --git a/examples-3.0/tutorial/syntax/MorphoIta.gf b/old-examples/tutorial/syntax/MorphoIta.gf
index 7bf4de1a1..7bf4de1a1 100644
--- a/examples-3.0/tutorial/syntax/MorphoIta.gf
+++ b/old-examples/tutorial/syntax/MorphoIta.gf
diff --git a/examples-3.0/tutorial/syntax/Syntax.gf b/old-examples/tutorial/syntax/Syntax.gf
index e5b27504d..31f3fc127 100644
--- a/examples-3.0/tutorial/syntax/Syntax.gf
+++ b/old-examples/tutorial/syntax/Syntax.gf
@@ -10,17 +10,17 @@ oper
 
   mkS = overload {
     mkS : Pol -> NP -> VP -> S
-       = \p,np,vp -> UseCl p (PredVP np vp) ;
+       = PredVP ;
     mkS : NP -> VP -> S
-       = \np,vp -> UseCl PPos (PredVP np vp) ;
+       = PredVP PPos ;
     mkS : Pol -> NP -> V2 -> NP -> S
-       = \p,np,v,o -> UseCl p (PredVP np (ComplV2 v o)) ;
+       = \p,np,v,o -> PredVP p np (ComplV2 v o) ;
     mkS : NP -> V2 -> NP -> S
-       = \np,v,o -> UseCl PPos (PredVP np (ComplV2 v o)) ;
+       = \np,v,o -> PredVP PPos np (ComplV2 v o) ;
     mkS : Pol -> NP -> AP -> S
-       = \p,np,ap -> UseCl p (PredVP np (ComplAP ap)) ;
+       = \p,np,ap -> PredVP p np (ComplAP ap) ;
     mkS : NP -> AP -> S
-       = \np,ap -> UseCl PPos (PredVP np (ComplAP ap)) ;
+       = \np,ap -> PredVP PPos np (ComplAP ap) ;
     } ;
 
   mkNP : Det -> CN -> NP 
diff --git a/examples-3.0/tutorial/syntax/SyntaxEng.gf b/old-examples/tutorial/syntax/SyntaxEng.gf
index 72e3d599a..72e3d599a 100644
--- a/examples-3.0/tutorial/syntax/SyntaxEng.gf
+++ b/old-examples/tutorial/syntax/SyntaxEng.gf
diff --git a/examples-3.0/tutorial/syntax/SyntaxIta.gf b/old-examples/tutorial/syntax/SyntaxIta.gf
index 76e231a8e..76e231a8e 100644
--- a/examples-3.0/tutorial/syntax/SyntaxIta.gf
+++ b/old-examples/tutorial/syntax/SyntaxIta.gf
diff --git a/examples-3.0/tutorial/syntax/Test.gf b/old-examples/tutorial/syntax/Test.gf
index 3284d5246..3284d5246 100644
--- a/examples-3.0/tutorial/syntax/Test.gf
+++ b/old-examples/tutorial/syntax/Test.gf
diff --git a/examples-3.0/tutorial/syntax/TestEng.gf b/old-examples/tutorial/syntax/TestEng.gf
index 32491c000..32491c000 100644
--- a/examples-3.0/tutorial/syntax/TestEng.gf
+++ b/old-examples/tutorial/syntax/TestEng.gf
diff --git a/examples-3.0/tutorial/syntax/TestIta.gf b/old-examples/tutorial/syntax/TestIta.gf
index 5e05cdcab..5e05cdcab 100644
--- a/examples-3.0/tutorial/syntax/TestIta.gf
+++ b/old-examples/tutorial/syntax/TestIta.gf
diff --git a/examples/unix/Char.gf b/old-examples/unix/Char.gf
index f10284587..f10284587 100644
--- a/examples/unix/Char.gf
+++ b/old-examples/unix/Char.gf
diff --git a/examples/unix/CharEng.gf b/old-examples/unix/CharEng.gf
index 7348278f5..7348278f5 100644
--- a/examples/unix/CharEng.gf
+++ b/old-examples/unix/CharEng.gf
diff --git a/examples/unix/CharEngLett.gf b/old-examples/unix/CharEngLett.gf
index 39d9b9d16..39d9b9d16 100644
--- a/examples/unix/CharEngLett.gf
+++ b/old-examples/unix/CharEngLett.gf
diff --git a/examples/unix/CharUni.gf b/old-examples/unix/CharUni.gf
index 0e6628657..0e6628657 100644
--- a/examples/unix/CharUni.gf
+++ b/old-examples/unix/CharUni.gf
diff --git a/examples/unix/Unix.gf b/old-examples/unix/Unix.gf
index ea5e2c2af..ea5e2c2af 100644
--- a/examples/unix/Unix.gf
+++ b/old-examples/unix/Unix.gf
diff --git a/examples/unix/UnixEng.gf b/old-examples/unix/UnixEng.gf
index 5b0ca944f..5b0ca944f 100644
--- a/examples/unix/UnixEng.gf
+++ b/old-examples/unix/UnixEng.gf
diff --git a/examples/unix/UnixUni.gf b/old-examples/unix/UnixUni.gf
index b1b220824..b1b220824 100644
--- a/examples/unix/UnixUni.gf
+++ b/old-examples/unix/UnixUni.gf
diff --git a/examples/urduhindi/CatUrduHindiAbs.gf b/old-examples/urduhindi/CatUrduHindiAbs.gf
index c85e2b1a2..c85e2b1a2 100644
--- a/examples/urduhindi/CatUrduHindiAbs.gf
+++ b/old-examples/urduhindi/CatUrduHindiAbs.gf
diff --git a/examples/urduhindi/LexUrd.gf b/old-examples/urduhindi/LexUrd.gf
index 55db74515..55db74515 100644
--- a/examples/urduhindi/LexUrd.gf
+++ b/old-examples/urduhindi/LexUrd.gf
diff --git a/examples/urduhindi/Lexicon.gf b/old-examples/urduhindi/Lexicon.gf
index f62bc896c..f62bc896c 100644
--- a/examples/urduhindi/Lexicon.gf
+++ b/old-examples/urduhindi/Lexicon.gf
diff --git a/examples/urduhindi/README b/old-examples/urduhindi/README
index 8e369e70f..8e369e70f 100644
--- a/examples/urduhindi/README
+++ b/old-examples/urduhindi/README
diff --git a/examples/urduhindi/ResUrdHin.gf b/old-examples/urduhindi/ResUrdHin.gf
index 0191ca71d..0191ca71d 100644
--- a/examples/urduhindi/ResUrdHin.gf
+++ b/old-examples/urduhindi/ResUrdHin.gf
diff --git a/examples/urduhindi/Urdu.gf b/old-examples/urduhindi/Urdu.gf
index c519d94b6..c519d94b6 100644
--- a/examples/urduhindi/Urdu.gf
+++ b/old-examples/urduhindi/Urdu.gf
diff --git a/examples/urduhindi/UrduHindi.gf b/old-examples/urduhindi/UrduHindi.gf
index 4aded6051..4aded6051 100644
--- a/examples/urduhindi/UrduHindi.gf
+++ b/old-examples/urduhindi/UrduHindi.gf
diff --git a/examples/urduhindi/UrduHindiAbs.gf b/old-examples/urduhindi/UrduHindiAbs.gf
index 8e591705a..8e591705a 100644
--- a/examples/urduhindi/UrduHindiAbs.gf
+++ b/old-examples/urduhindi/UrduHindiAbs.gf
diff --git a/examples/uusisuomi/Conjugations.gf b/old-examples/uusisuomi/Conjugations.gf
index c4448a7ad..c4448a7ad 100644
--- a/examples/uusisuomi/Conjugations.gf
+++ b/old-examples/uusisuomi/Conjugations.gf
diff --git a/examples/uusisuomi/Declensions.gf b/old-examples/uusisuomi/Declensions.gf
index 9ff0d1f10..9ff0d1f10 100644
--- a/examples/uusisuomi/Declensions.gf
+++ b/old-examples/uusisuomi/Declensions.gf
diff --git a/examples/uusisuomi/EnsiNominal.gf b/old-examples/uusisuomi/EnsiNominal.gf
index 23a28d892..23a28d892 100644
--- a/examples/uusisuomi/EnsiNominal.gf
+++ b/old-examples/uusisuomi/EnsiNominal.gf
diff --git a/examples/uusisuomi/Kotus.gf b/old-examples/uusisuomi/Kotus.gf
index d2e3f0510..d2e3f0510 100644
--- a/examples/uusisuomi/Kotus.gf
+++ b/old-examples/uusisuomi/Kotus.gf
diff --git a/examples/uusisuomi/Makefile b/old-examples/uusisuomi/Makefile
index 7214c9434..7214c9434 100644
--- a/examples/uusisuomi/Makefile
+++ b/old-examples/uusisuomi/Makefile
diff --git a/examples/uusisuomi/MkLex.hs b/old-examples/uusisuomi/MkLex.hs
index 0e63a5e62..0e63a5e62 100644
--- a/examples/uusisuomi/MkLex.hs
+++ b/old-examples/uusisuomi/MkLex.hs
diff --git a/examples/uusisuomi/MyDiff.hs b/old-examples/uusisuomi/MyDiff.hs
index f695978aa..f695978aa 100644
--- a/examples/uusisuomi/MyDiff.hs
+++ b/old-examples/uusisuomi/MyDiff.hs
diff --git a/examples/uusisuomi/Nominal.gf b/old-examples/uusisuomi/Nominal.gf
index 29a09df26..29a09df26 100644
--- a/examples/uusisuomi/Nominal.gf
+++ b/old-examples/uusisuomi/Nominal.gf
diff --git a/examples/uusisuomi/Nominal1.gf b/old-examples/uusisuomi/Nominal1.gf
index 1cbbf1298..1cbbf1298 100644
--- a/examples/uusisuomi/Nominal1.gf
+++ b/old-examples/uusisuomi/Nominal1.gf
diff --git a/examples/uusisuomi/Verbal.gf b/old-examples/uusisuomi/Verbal.gf
index fbc60fed5..fbc60fed5 100644
--- a/examples/uusisuomi/Verbal.gf
+++ b/old-examples/uusisuomi/Verbal.gf
diff --git a/examples/uusisuomi/aino.txt b/old-examples/uusisuomi/aino.txt
index 1711e0749..1711e0749 100644
--- a/examples/uusisuomi/aino.txt
+++ b/old-examples/uusisuomi/aino.txt
diff --git a/examples/uusisuomi/bootstrapping.txt b/old-examples/uusisuomi/bootstrapping.txt
index d9f83def6..d9f83def6 100644
--- a/examples/uusisuomi/bootstrapping.txt
+++ b/old-examples/uusisuomi/bootstrapping.txt
diff --git a/examples/uusisuomi/correct-Aino.txt b/old-examples/uusisuomi/correct-Aino.txt
index 467c73845..467c73845 100644
--- a/examples/uusisuomi/correct-Aino.txt
+++ b/old-examples/uusisuomi/correct-Aino.txt
diff --git a/examples/uusisuomi/correct-Dictionary.txt b/old-examples/uusisuomi/correct-Dictionary.txt
index 57f73408d..57f73408d 100644
--- a/examples/uusisuomi/correct-Dictionary.txt
+++ b/old-examples/uusisuomi/correct-Dictionary.txt
diff --git a/examples/uusisuomi/correct-Duodecim.txt b/old-examples/uusisuomi/correct-Duodecim.txt
index a56ec4167..a56ec4167 100644
--- a/examples/uusisuomi/correct-Duodecim.txt
+++ b/old-examples/uusisuomi/correct-Duodecim.txt
diff --git a/examples/uusisuomi/correct-KOTUS.txt b/old-examples/uusisuomi/correct-KOTUS.txt
index 349142a88..349142a88 100644
--- a/examples/uusisuomi/correct-KOTUS.txt
+++ b/old-examples/uusisuomi/correct-KOTUS.txt
diff --git a/examples/uusisuomi/correct-NSSK.txt b/old-examples/uusisuomi/correct-NSSK.txt
index 32c3eb79e..32c3eb79e 100644
--- a/examples/uusisuomi/correct-NSSK.txt
+++ b/old-examples/uusisuomi/correct-NSSK.txt
diff --git a/examples/uusisuomi/correct-Omat.txt b/old-examples/uusisuomi/correct-Omat.txt
index 65bcdcd35..65bcdcd35 100644
--- a/examples/uusisuomi/correct-Omat.txt
+++ b/old-examples/uusisuomi/correct-Omat.txt
diff --git a/examples/uusisuomi/correct-Swadesh.txt b/old-examples/uusisuomi/correct-Swadesh.txt
index cb056c28f..cb056c28f 100644
--- a/examples/uusisuomi/correct-Swadesh.txt
+++ b/old-examples/uusisuomi/correct-Swadesh.txt
diff --git a/examples/uusisuomi/correct-VDictionary.txt b/old-examples/uusisuomi/correct-VDictionary.txt
index 1a6da14bf..1a6da14bf 100644
--- a/examples/uusisuomi/correct-VDictionary.txt
+++ b/old-examples/uusisuomi/correct-VDictionary.txt
diff --git a/examples/uusisuomi/correct-VNSSK.txt b/old-examples/uusisuomi/correct-VNSSK.txt
index ea13446b4..ea13446b4 100644
--- a/examples/uusisuomi/correct-VNSSK.txt
+++ b/old-examples/uusisuomi/correct-VNSSK.txt
diff --git a/examples/uusisuomi/correct-VOmat.txt b/old-examples/uusisuomi/correct-VOmat.txt
index 261008c37..261008c37 100644
--- a/examples/uusisuomi/correct-VOmat.txt
+++ b/old-examples/uusisuomi/correct-VOmat.txt
diff --git a/examples/uusisuomi/correct-VSwadesh.txt b/old-examples/uusisuomi/correct-VSwadesh.txt
index 709d4cbc0..709d4cbc0 100644
--- a/examples/uusisuomi/correct-VSwadesh.txt
+++ b/old-examples/uusisuomi/correct-VSwadesh.txt
diff --git a/examples/uusisuomi/duodecim.txt b/old-examples/uusisuomi/duodecim.txt
index 85e9eebd9..85e9eebd9 100644
--- a/examples/uusisuomi/duodecim.txt
+++ b/old-examples/uusisuomi/duodecim.txt
diff --git a/examples/uusisuomi/kotus/Kotus.hs b/old-examples/uusisuomi/kotus/Kotus.hs
index ad63a1e14..ad63a1e14 100644
--- a/examples/uusisuomi/kotus/Kotus.hs
+++ b/old-examples/uusisuomi/kotus/Kotus.hs
diff --git a/examples/uusisuomi/kotus/kotus-sanalista.dtd b/old-examples/uusisuomi/kotus/kotus-sanalista.dtd
index df7167e13..df7167e13 100644
--- a/examples/uusisuomi/kotus/kotus-sanalista.dtd
+++ b/old-examples/uusisuomi/kotus/kotus-sanalista.dtd
diff --git a/examples/uusisuomi/kotus/kotus-sanalista_v1.xml b/old-examples/uusisuomi/kotus/kotus-sanalista_v1.xml
index 1b9c6e989..1b9c6e989 100644
--- a/examples/uusisuomi/kotus/kotus-sanalista_v1.xml
+++ b/old-examples/uusisuomi/kotus/kotus-sanalista_v1.xml
diff --git a/examples/uusisuomi/kotus/sanat.xxmmll b/old-examples/uusisuomi/kotus/sanat.xxmmll
index a36199106..a36199106 100644
--- a/examples/uusisuomi/kotus/sanat.xxmmll
+++ b/old-examples/uusisuomi/kotus/sanat.xxmmll
diff --git a/examples/uusisuomi/results.txt b/old-examples/uusisuomi/results.txt
index 9e83076a5..9e83076a5 100644
--- a/examples/uusisuomi/results.txt
+++ b/old-examples/uusisuomi/results.txt
diff --git a/examples/wiki/Editor.gf b/old-examples/wiki/Editor.gf
index ff7c1f5fa..ff7c1f5fa 100644
--- a/examples/wiki/Editor.gf
+++ b/old-examples/wiki/Editor.gf
diff --git a/examples/wiki/EditorEng.gf b/old-examples/wiki/EditorEng.gf
index 11e5efdca..11e5efdca 100644
--- a/examples/wiki/EditorEng.gf
+++ b/old-examples/wiki/EditorEng.gf
diff --git a/examples/wiki/EditorFin.gf b/old-examples/wiki/EditorFin.gf
index a56b1fb68..a56b1fb68 100644
--- a/examples/wiki/EditorFin.gf
+++ b/old-examples/wiki/EditorFin.gf
diff --git a/examples/wiki/EditorFre.gf b/old-examples/wiki/EditorFre.gf
index ed591b29d..ed591b29d 100644
--- a/examples/wiki/EditorFre.gf
+++ b/old-examples/wiki/EditorFre.gf
diff --git a/examples/wiki/EditorI.gf b/old-examples/wiki/EditorI.gf
index f5b51baa1..f5b51baa1 100644
--- a/examples/wiki/EditorI.gf
+++ b/old-examples/wiki/EditorI.gf
diff --git a/examples/wiki/EditorSpa.gf b/old-examples/wiki/EditorSpa.gf
index 1b442a717..1b442a717 100644
--- a/examples/wiki/EditorSpa.gf
+++ b/old-examples/wiki/EditorSpa.gf
diff --git a/examples/wiki/EditorSwe.gf b/old-examples/wiki/EditorSwe.gf
index 89a733b1c..89a733b1c 100644
--- a/examples/wiki/EditorSwe.gf
+++ b/old-examples/wiki/EditorSwe.gf
diff --git a/examples/wiki/LexEditor.gf b/old-examples/wiki/LexEditor.gf
index f9c263e93..f9c263e93 100644
--- a/examples/wiki/LexEditor.gf
+++ b/old-examples/wiki/LexEditor.gf
diff --git a/examples/wiki/LexEditorEng.gf b/old-examples/wiki/LexEditorEng.gf
index 094cb539a..094cb539a 100644
--- a/examples/wiki/LexEditorEng.gf
+++ b/old-examples/wiki/LexEditorEng.gf
diff --git a/examples/wiki/LexEditorFin.gf b/old-examples/wiki/LexEditorFin.gf
index 21bd9ae00..21bd9ae00 100644
--- a/examples/wiki/LexEditorFin.gf
+++ b/old-examples/wiki/LexEditorFin.gf
diff --git a/examples/wiki/LexEditorFre.gf b/old-examples/wiki/LexEditorFre.gf
index 519d3d7e8..519d3d7e8 100644
--- a/examples/wiki/LexEditorFre.gf
+++ b/old-examples/wiki/LexEditorFre.gf
diff --git a/examples/wiki/LexEditorSpa.gf b/old-examples/wiki/LexEditorSpa.gf
index 1e0c8793d..1e0c8793d 100644
--- a/examples/wiki/LexEditorSpa.gf
+++ b/old-examples/wiki/LexEditorSpa.gf
diff --git a/examples/wiki/LexEditorSwe.gf b/old-examples/wiki/LexEditorSwe.gf
index f414dbe3d..f414dbe3d 100644
--- a/examples/wiki/LexEditorSwe.gf
+++ b/old-examples/wiki/LexEditorSwe.gf
diff --git a/examples/wiki/LexRestaurant.gf b/old-examples/wiki/LexRestaurant.gf
index 50436e079..50436e079 100644
--- a/examples/wiki/LexRestaurant.gf
+++ b/old-examples/wiki/LexRestaurant.gf
diff --git a/examples/wiki/LexRestaurantEng.gf b/old-examples/wiki/LexRestaurantEng.gf
index 944484cb5..944484cb5 100644
--- a/examples/wiki/LexRestaurantEng.gf
+++ b/old-examples/wiki/LexRestaurantEng.gf
diff --git a/examples/wiki/LexRestaurantFin.gf b/old-examples/wiki/LexRestaurantFin.gf
index 0e5853797..0e5853797 100644
--- a/examples/wiki/LexRestaurantFin.gf
+++ b/old-examples/wiki/LexRestaurantFin.gf
diff --git a/examples/wiki/LexRestaurantFre.gf b/old-examples/wiki/LexRestaurantFre.gf
index fa3623748..fa3623748 100644
--- a/examples/wiki/LexRestaurantFre.gf
+++ b/old-examples/wiki/LexRestaurantFre.gf
diff --git a/examples/wiki/LexRestaurantSpa.gf b/old-examples/wiki/LexRestaurantSpa.gf
index a7be39e0c..a7be39e0c 100644
--- a/examples/wiki/LexRestaurantSpa.gf
+++ b/old-examples/wiki/LexRestaurantSpa.gf
diff --git a/examples/wiki/LexRestaurantSwe.gf b/old-examples/wiki/LexRestaurantSwe.gf
index 695c78e28..695c78e28 100644
--- a/examples/wiki/LexRestaurantSwe.gf
+++ b/old-examples/wiki/LexRestaurantSwe.gf
diff --git a/examples/wiki/LexWiki.gf b/old-examples/wiki/LexWiki.gf
index 2b7efc58e..2b7efc58e 100644
--- a/examples/wiki/LexWiki.gf
+++ b/old-examples/wiki/LexWiki.gf
diff --git a/examples/wiki/LexWikiEng.gf b/old-examples/wiki/LexWikiEng.gf
index 2dc810189..2dc810189 100644
--- a/examples/wiki/LexWikiEng.gf
+++ b/old-examples/wiki/LexWikiEng.gf
diff --git a/examples/wiki/LexWikiFin.gf b/old-examples/wiki/LexWikiFin.gf
index 033a3f448..033a3f448 100644
--- a/examples/wiki/LexWikiFin.gf
+++ b/old-examples/wiki/LexWikiFin.gf
diff --git a/examples/wiki/LexWikiFre.gf b/old-examples/wiki/LexWikiFre.gf
index c187af79e..c187af79e 100644
--- a/examples/wiki/LexWikiFre.gf
+++ b/old-examples/wiki/LexWikiFre.gf
diff --git a/examples/wiki/LexWikiSpa.gf b/old-examples/wiki/LexWikiSpa.gf
index 306aed30a..306aed30a 100644
--- a/examples/wiki/LexWikiSpa.gf
+++ b/old-examples/wiki/LexWikiSpa.gf
diff --git a/examples/wiki/LexWikiSwe.gf b/old-examples/wiki/LexWikiSwe.gf
index 5dfba8de8..5dfba8de8 100644
--- a/examples/wiki/LexWikiSwe.gf
+++ b/old-examples/wiki/LexWikiSwe.gf
diff --git a/examples/wiki/Restaurant.gf b/old-examples/wiki/Restaurant.gf
index 447c6cf14..447c6cf14 100644
--- a/examples/wiki/Restaurant.gf
+++ b/old-examples/wiki/Restaurant.gf
diff --git a/examples/wiki/RestaurantEng.gf b/old-examples/wiki/RestaurantEng.gf
index 1d1655ff7..1d1655ff7 100644
--- a/examples/wiki/RestaurantEng.gf
+++ b/old-examples/wiki/RestaurantEng.gf
diff --git a/examples/wiki/RestaurantFin.gf b/old-examples/wiki/RestaurantFin.gf
index aaf7a2c5c..aaf7a2c5c 100644
--- a/examples/wiki/RestaurantFin.gf
+++ b/old-examples/wiki/RestaurantFin.gf
diff --git a/examples/wiki/RestaurantFre.gf b/old-examples/wiki/RestaurantFre.gf
index 7ae6b1bad..7ae6b1bad 100644
--- a/examples/wiki/RestaurantFre.gf
+++ b/old-examples/wiki/RestaurantFre.gf
diff --git a/examples/wiki/RestaurantI.gf b/old-examples/wiki/RestaurantI.gf
index 9d491f01e..9d491f01e 100644
--- a/examples/wiki/RestaurantI.gf
+++ b/old-examples/wiki/RestaurantI.gf
diff --git a/examples/wiki/RestaurantSpa.gf b/old-examples/wiki/RestaurantSpa.gf
index cc516d2eb..cc516d2eb 100644
--- a/examples/wiki/RestaurantSpa.gf
+++ b/old-examples/wiki/RestaurantSpa.gf
diff --git a/examples/wiki/RestaurantSwe.gf b/old-examples/wiki/RestaurantSwe.gf
index 9cd487892..9cd487892 100644
--- a/examples/wiki/RestaurantSwe.gf
+++ b/old-examples/wiki/RestaurantSwe.gf
diff --git a/examples/wiki/Wiki.gf b/old-examples/wiki/Wiki.gf
index c8842044e..c8842044e 100644
--- a/examples/wiki/Wiki.gf
+++ b/old-examples/wiki/Wiki.gf
diff --git a/examples/wiki/WikiEng.gf b/old-examples/wiki/WikiEng.gf
index 0c42d1b36..0c42d1b36 100644
--- a/examples/wiki/WikiEng.gf
+++ b/old-examples/wiki/WikiEng.gf
diff --git a/examples/wiki/WikiFin.gf b/old-examples/wiki/WikiFin.gf
index df504768c..df504768c 100644
--- a/examples/wiki/WikiFin.gf
+++ b/old-examples/wiki/WikiFin.gf
diff --git a/examples/wiki/WikiFre.gf b/old-examples/wiki/WikiFre.gf
index 98ea770b5..98ea770b5 100644
--- a/examples/wiki/WikiFre.gf
+++ b/old-examples/wiki/WikiFre.gf
diff --git a/examples/wiki/WikiI.gf b/old-examples/wiki/WikiI.gf
index 1c18c111c..1c18c111c 100644
--- a/examples/wiki/WikiI.gf
+++ b/old-examples/wiki/WikiI.gf
diff --git a/examples/wiki/WikiSpa.gf b/old-examples/wiki/WikiSpa.gf
index c7d2c6508..c7d2c6508 100644
--- a/examples/wiki/WikiSpa.gf
+++ b/old-examples/wiki/WikiSpa.gf
diff --git a/examples/wiki/WikiSwe.gf b/old-examples/wiki/WikiSwe.gf
index fa911ad6f..fa911ad6f 100644
--- a/examples/wiki/WikiSwe.gf
+++ b/old-examples/wiki/WikiSwe.gf
diff --git a/src-3.0/FILES b/src/FILES
index 1311108b6..1311108b6 100644
--- a/src-3.0/FILES
+++ b/src/FILES
diff --git a/src-3.0/GF.hs b/src/GF.hs
index 5b1776987..5b1776987 100644
--- a/src-3.0/GF.hs
+++ b/src/GF.hs
diff --git a/src-3.0/GF/Command/Abstract.hs b/src/GF/Command/Abstract.hs
index 29111b432..29111b432 100644
--- a/src-3.0/GF/Command/Abstract.hs
+++ b/src/GF/Command/Abstract.hs
diff --git a/src-3.0/GF/Command/Commands.hs b/src/GF/Command/Commands.hs
index 96e7c57f4..96e7c57f4 100644
--- a/src-3.0/GF/Command/Commands.hs
+++ b/src/GF/Command/Commands.hs
diff --git a/src-3.0/GF/Command/Importing.hs b/src/GF/Command/Importing.hs
index c3ad9d746..c3ad9d746 100644
--- a/src-3.0/GF/Command/Importing.hs
+++ b/src/GF/Command/Importing.hs
diff --git a/src-3.0/GF/Command/Interpreter.hs b/src/GF/Command/Interpreter.hs
index e1a06a205..e1a06a205 100644
--- a/src-3.0/GF/Command/Interpreter.hs
+++ b/src/GF/Command/Interpreter.hs
diff --git a/src-3.0/GF/Command/Parse.hs b/src/GF/Command/Parse.hs
index eaf4cba84..eaf4cba84 100644
--- a/src-3.0/GF/Command/Parse.hs
+++ b/src/GF/Command/Parse.hs
diff --git a/src-3.0/GF/Compile.hs b/src/GF/Compile.hs
index eb491cc78..eb491cc78 100644
--- a/src-3.0/GF/Compile.hs
+++ b/src/GF/Compile.hs
diff --git a/src-3.0/GF/Compile/BackOpt.hs b/src/GF/Compile/BackOpt.hs
index 8667023c0..8667023c0 100644
--- a/src-3.0/GF/Compile/BackOpt.hs
+++ b/src/GF/Compile/BackOpt.hs
diff --git a/src-3.0/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs
index 0a8361d36..0a8361d36 100644
--- a/src-3.0/GF/Compile/CheckGrammar.hs
+++ b/src/GF/Compile/CheckGrammar.hs
diff --git a/src-3.0/GF/Compile/Compute.hs b/src/GF/Compile/Compute.hs
index f35e7c6a9..f35e7c6a9 100644
--- a/src-3.0/GF/Compile/Compute.hs
+++ b/src/GF/Compile/Compute.hs
diff --git a/src-3.0/GF/Compile/Export.hs b/src/GF/Compile/Export.hs
index 9e9a99e99..9e9a99e99 100644
--- a/src-3.0/GF/Compile/Export.hs
+++ b/src/GF/Compile/Export.hs
diff --git a/src-3.0/GF/Compile/Extend.hs b/src/GF/Compile/Extend.hs
index 8344a1696..8344a1696 100644
--- a/src-3.0/GF/Compile/Extend.hs
+++ b/src/GF/Compile/Extend.hs
diff --git a/src-3.0/GF/Compile/GFCCtoHaskell.hs b/src/GF/Compile/GFCCtoHaskell.hs
index 59db9c364..59db9c364 100644
--- a/src-3.0/GF/Compile/GFCCtoHaskell.hs
+++ b/src/GF/Compile/GFCCtoHaskell.hs
diff --git a/src-3.0/GF/Compile/GFCCtoJS.hs b/src/GF/Compile/GFCCtoJS.hs
index 8259e7385..8259e7385 100644
--- a/src-3.0/GF/Compile/GFCCtoJS.hs
+++ b/src/GF/Compile/GFCCtoJS.hs
diff --git a/src-3.0/GF/Compile/GenerateFCFG.hs b/src/GF/Compile/GenerateFCFG.hs
index c2854ef3d..c2854ef3d 100644
--- a/src-3.0/GF/Compile/GenerateFCFG.hs
+++ b/src/GF/Compile/GenerateFCFG.hs
diff --git a/src-3.0/GF/Compile/GeneratePMCFG.hs b/src/GF/Compile/GeneratePMCFG.hs
index e0343e8d6..e0343e8d6 100644
--- a/src-3.0/GF/Compile/GeneratePMCFG.hs
+++ b/src/GF/Compile/GeneratePMCFG.hs
diff --git a/src-3.0/GF/Compile/GetGrammar.hs b/src/GF/Compile/GetGrammar.hs
index a8eb8b749..a8eb8b749 100644
--- a/src-3.0/GF/Compile/GetGrammar.hs
+++ b/src/GF/Compile/GetGrammar.hs
diff --git a/src-3.0/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs
index d14a914f1..d14a914f1 100644
--- a/src-3.0/GF/Compile/GrammarToGFCC.hs
+++ b/src/GF/Compile/GrammarToGFCC.hs
diff --git a/src-3.0/GF/Compile/ModDeps.hs b/src/GF/Compile/ModDeps.hs
index b5b1b798c..b5b1b798c 100644
--- a/src-3.0/GF/Compile/ModDeps.hs
+++ b/src/GF/Compile/ModDeps.hs
diff --git a/src-3.0/GF/Compile/Optimize.hs b/src/GF/Compile/Optimize.hs
index 83cbeb57a..83cbeb57a 100644
--- a/src-3.0/GF/Compile/Optimize.hs
+++ b/src/GF/Compile/Optimize.hs
diff --git a/src-3.0/GF/Compile/OptimizeGF.hs b/src/GF/Compile/OptimizeGF.hs
index 41b828aa3..41b828aa3 100644
--- a/src-3.0/GF/Compile/OptimizeGF.hs
+++ b/src/GF/Compile/OptimizeGF.hs
diff --git a/src-3.0/GF/Compile/OptimizeGFCC.hs b/src/GF/Compile/OptimizeGFCC.hs
index c73d5bbcb..c73d5bbcb 100644
--- a/src-3.0/GF/Compile/OptimizeGFCC.hs
+++ b/src/GF/Compile/OptimizeGFCC.hs
diff --git a/src-3.0/GF/Compile/ReadFiles.hs b/src/GF/Compile/ReadFiles.hs
index cd2faec15..cd2faec15 100644
--- a/src-3.0/GF/Compile/ReadFiles.hs
+++ b/src/GF/Compile/ReadFiles.hs
diff --git a/src-3.0/GF/Compile/Rebuild.hs b/src/GF/Compile/Rebuild.hs
index ec9076e1c..ec9076e1c 100644
--- a/src-3.0/GF/Compile/Rebuild.hs
+++ b/src/GF/Compile/Rebuild.hs
diff --git a/src-3.0/GF/Compile/Refresh.hs b/src/GF/Compile/Refresh.hs
index 39fb57db0..39fb57db0 100644
--- a/src-3.0/GF/Compile/Refresh.hs
+++ b/src/GF/Compile/Refresh.hs
diff --git a/src-3.0/GF/Compile/RemoveLiT.hs b/src/GF/Compile/RemoveLiT.hs
index d06b80400..d06b80400 100644
--- a/src-3.0/GF/Compile/RemoveLiT.hs
+++ b/src/GF/Compile/RemoveLiT.hs
diff --git a/src-3.0/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs
index 7b4d09277..7b4d09277 100644
--- a/src-3.0/GF/Compile/Rename.hs
+++ b/src/GF/Compile/Rename.hs
diff --git a/src-3.0/GF/Compile/TC.hs b/src/GF/Compile/TC.hs
index c0c8a83ae..c0c8a83ae 100644
--- a/src-3.0/GF/Compile/TC.hs
+++ b/src/GF/Compile/TC.hs
diff --git a/src-3.0/GF/Compile/TypeCheck.hs b/src/GF/Compile/TypeCheck.hs
index 2d58a33ee..2d58a33ee 100644
--- a/src-3.0/GF/Compile/TypeCheck.hs
+++ b/src/GF/Compile/TypeCheck.hs
diff --git a/src-3.0/GF/Compile/Update.hs b/src/GF/Compile/Update.hs
index 82d7a609e..82d7a609e 100644
--- a/src-3.0/GF/Compile/Update.hs
+++ b/src/GF/Compile/Update.hs
diff --git a/src-3.0/GF/Data/Assoc.hs b/src/GF/Data/Assoc.hs
index f775319ea..f775319ea 100644
--- a/src-3.0/GF/Data/Assoc.hs
+++ b/src/GF/Data/Assoc.hs
diff --git a/src-3.0/GF/Data/BacktrackM.hs b/src/GF/Data/BacktrackM.hs
index 790d11a83..790d11a83 100644
--- a/src-3.0/GF/Data/BacktrackM.hs
+++ b/src/GF/Data/BacktrackM.hs
diff --git a/src-3.0/GF/Data/ErrM.hs b/src/GF/Data/ErrM.hs
index e8cea12d4..e8cea12d4 100644
--- a/src-3.0/GF/Data/ErrM.hs
+++ b/src/GF/Data/ErrM.hs
diff --git a/src-3.0/GF/Data/MultiMap.hs b/src/GF/Data/MultiMap.hs
index e565f433b..e565f433b 100644
--- a/src-3.0/GF/Data/MultiMap.hs
+++ b/src/GF/Data/MultiMap.hs
diff --git a/src-3.0/GF/Data/Operations.hs b/src/GF/Data/Operations.hs
index 253723876..253723876 100644
--- a/src-3.0/GF/Data/Operations.hs
+++ b/src/GF/Data/Operations.hs
diff --git a/src-3.0/GF/Data/SortedList.hs b/src/GF/Data/SortedList.hs
index d77ff68d4..d77ff68d4 100644
--- a/src-3.0/GF/Data/SortedList.hs
+++ b/src/GF/Data/SortedList.hs
diff --git a/src-3.0/GF/Data/Str.hs b/src/GF/Data/Str.hs
index 6f65764c7..6f65764c7 100644
--- a/src-3.0/GF/Data/Str.hs
+++ b/src/GF/Data/Str.hs
diff --git a/src-3.0/GF/Data/Utilities.hs b/src/GF/Data/Utilities.hs
index 74d3ef81e..74d3ef81e 100644
--- a/src-3.0/GF/Data/Utilities.hs
+++ b/src/GF/Data/Utilities.hs
diff --git a/src-3.0/GF/Data/XML.hs b/src/GF/Data/XML.hs
index 0c2efb7dc..0c2efb7dc 100644
--- a/src-3.0/GF/Data/XML.hs
+++ b/src/GF/Data/XML.hs
diff --git a/src-3.0/GF/Data/Zipper.hs b/src/GF/Data/Zipper.hs
index a4491f76e..a4491f76e 100644
--- a/src-3.0/GF/Data/Zipper.hs
+++ b/src/GF/Data/Zipper.hs
diff --git a/src-3.0/GF/Devel/README-testgf3 b/src/GF/Devel/README-testgf3
index 0d1b6e80a..0d1b6e80a 100644
--- a/src-3.0/GF/Devel/README-testgf3
+++ b/src/GF/Devel/README-testgf3
diff --git a/src-3.0/GF/Devel/gf-code.txt b/src/GF/Devel/gf-code.txt
index e8954bedf..e8954bedf 100644
--- a/src-3.0/GF/Devel/gf-code.txt
+++ b/src/GF/Devel/gf-code.txt
diff --git a/src-3.0/GF/Devel/gf3.txt b/src/GF/Devel/gf3.txt
index 56feeba2a..56feeba2a 100644
--- a/src-3.0/GF/Devel/gf3.txt
+++ b/src/GF/Devel/gf3.txt
diff --git a/src-3.0/GF/Grammar/API.hs b/src/GF/Grammar/API.hs
index 182b5e94e..182b5e94e 100644
--- a/src-3.0/GF/Grammar/API.hs
+++ b/src/GF/Grammar/API.hs
diff --git a/src-3.0/GF/Grammar/Abstract.hs b/src/GF/Grammar/Abstract.hs
index c03783a52..c03783a52 100644
--- a/src-3.0/GF/Grammar/Abstract.hs
+++ b/src/GF/Grammar/Abstract.hs
diff --git a/src-3.0/GF/Grammar/AppPredefined.hs b/src/GF/Grammar/AppPredefined.hs
index cfb6baf1d..cfb6baf1d 100644
--- a/src-3.0/GF/Grammar/AppPredefined.hs
+++ b/src/GF/Grammar/AppPredefined.hs
diff --git a/src-3.0/GF/Grammar/Grammar.hs b/src/GF/Grammar/Grammar.hs
index 4210358f1..4210358f1 100644
--- a/src-3.0/GF/Grammar/Grammar.hs
+++ b/src/GF/Grammar/Grammar.hs
diff --git a/src-3.0/GF/Grammar/Lockfield.hs b/src/GF/Grammar/Lockfield.hs
index 12b78ab9b..12b78ab9b 100644
--- a/src-3.0/GF/Grammar/Lockfield.hs
+++ b/src/GF/Grammar/Lockfield.hs
diff --git a/src-3.0/GF/Grammar/LookAbs.hs b/src/GF/Grammar/LookAbs.hs
index f9a251eb1..f9a251eb1 100644
--- a/src-3.0/GF/Grammar/LookAbs.hs
+++ b/src/GF/Grammar/LookAbs.hs
diff --git a/src-3.0/GF/Grammar/Lookup.hs b/src/GF/Grammar/Lookup.hs
index a4208b21b..a4208b21b 100644
--- a/src-3.0/GF/Grammar/Lookup.hs
+++ b/src/GF/Grammar/Lookup.hs
diff --git a/src-3.0/GF/Grammar/MMacros.hs b/src/GF/Grammar/MMacros.hs
index f2a0f2cb2..f2a0f2cb2 100644
--- a/src-3.0/GF/Grammar/MMacros.hs
+++ b/src/GF/Grammar/MMacros.hs
diff --git a/src-3.0/GF/Grammar/Macros.hs b/src/GF/Grammar/Macros.hs
index be03c02a7..be03c02a7 100644
--- a/src-3.0/GF/Grammar/Macros.hs
+++ b/src/GF/Grammar/Macros.hs
diff --git a/src-3.0/GF/Grammar/PatternMatch.hs b/src/GF/Grammar/PatternMatch.hs
index b96d35b93..b96d35b93 100644
--- a/src-3.0/GF/Grammar/PatternMatch.hs
+++ b/src/GF/Grammar/PatternMatch.hs
diff --git a/src-3.0/GF/Grammar/PrGrammar.hs b/src/GF/Grammar/PrGrammar.hs
index c1593dd63..c1593dd63 100644
--- a/src-3.0/GF/Grammar/PrGrammar.hs
+++ b/src/GF/Grammar/PrGrammar.hs
diff --git a/src-3.0/GF/Grammar/Predef.hs b/src/GF/Grammar/Predef.hs
index 71f152f92..71f152f92 100644
--- a/src-3.0/GF/Grammar/Predef.hs
+++ b/src/GF/Grammar/Predef.hs
diff --git a/src-3.0/GF/Grammar/ReservedWords.hs b/src/GF/Grammar/ReservedWords.hs
index b440141d6..b440141d6 100644
--- a/src-3.0/GF/Grammar/ReservedWords.hs
+++ b/src/GF/Grammar/ReservedWords.hs
diff --git a/src-3.0/GF/Grammar/Unify.hs b/src/GF/Grammar/Unify.hs
index 588c1b306..588c1b306 100644
--- a/src-3.0/GF/Grammar/Unify.hs
+++ b/src/GF/Grammar/Unify.hs
diff --git a/src-3.0/GF/Grammar/Values.hs b/src/GF/Grammar/Values.hs
index ab7d874da..ab7d874da 100644
--- a/src-3.0/GF/Grammar/Values.hs
+++ b/src/GF/Grammar/Values.hs
diff --git a/src-3.0/GF/Infra/CheckM.hs b/src/GF/Infra/CheckM.hs
index 251ed2b8b..251ed2b8b 100644
--- a/src-3.0/GF/Infra/CheckM.hs
+++ b/src/GF/Infra/CheckM.hs
diff --git a/src-3.0/GF/Infra/CompactPrint.hs b/src/GF/Infra/CompactPrint.hs
index 486c9e183..486c9e183 100644
--- a/src-3.0/GF/Infra/CompactPrint.hs
+++ b/src/GF/Infra/CompactPrint.hs
diff --git a/src-3.0/GF/Infra/GetOpt.hs b/src/GF/Infra/GetOpt.hs
index ede561c90..ede561c90 100644
--- a/src-3.0/GF/Infra/GetOpt.hs
+++ b/src/GF/Infra/GetOpt.hs
diff --git a/src-3.0/GF/Infra/Ident.hs b/src/GF/Infra/Ident.hs
index 45ebf3a5b..45ebf3a5b 100644
--- a/src-3.0/GF/Infra/Ident.hs
+++ b/src/GF/Infra/Ident.hs
diff --git a/src-3.0/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs
index 797f729c8..797f729c8 100644
--- a/src-3.0/GF/Infra/Modules.hs
+++ b/src/GF/Infra/Modules.hs
diff --git a/src-3.0/GF/Infra/Option.hs b/src/GF/Infra/Option.hs
index 380cb3af7..380cb3af7 100644
--- a/src-3.0/GF/Infra/Option.hs
+++ b/src/GF/Infra/Option.hs
diff --git a/src-3.0/GF/Infra/PrintClass.hs b/src/GF/Infra/PrintClass.hs
index 5e94984a6..5e94984a6 100644
--- a/src-3.0/GF/Infra/PrintClass.hs
+++ b/src/GF/Infra/PrintClass.hs
diff --git a/src-3.0/GF/Infra/UseIO.hs b/src/GF/Infra/UseIO.hs
index 00b956708..00b956708 100644
--- a/src-3.0/GF/Infra/UseIO.hs
+++ b/src/GF/Infra/UseIO.hs
diff --git a/src-3.0/GF/JavaScript/AbsJS.hs b/src/GF/JavaScript/AbsJS.hs
index 2632ade48..2632ade48 100644
--- a/src-3.0/GF/JavaScript/AbsJS.hs
+++ b/src/GF/JavaScript/AbsJS.hs
diff --git a/src-3.0/GF/JavaScript/JS.cf b/src/GF/JavaScript/JS.cf
index fe31a2074..fe31a2074 100644
--- a/src-3.0/GF/JavaScript/JS.cf
+++ b/src/GF/JavaScript/JS.cf
diff --git a/src-3.0/GF/JavaScript/LexJS.x b/src/GF/JavaScript/LexJS.x
index 10ba66d69..10ba66d69 100644
--- a/src-3.0/GF/JavaScript/LexJS.x
+++ b/src/GF/JavaScript/LexJS.x
diff --git a/src-3.0/GF/JavaScript/Makefile b/src/GF/JavaScript/Makefile
index 10f867b06..10f867b06 100644
--- a/src-3.0/GF/JavaScript/Makefile
+++ b/src/GF/JavaScript/Makefile
diff --git a/src-3.0/GF/JavaScript/ParJS.y b/src/GF/JavaScript/ParJS.y
index bf0614757..bf0614757 100644
--- a/src-3.0/GF/JavaScript/ParJS.y
+++ b/src/GF/JavaScript/ParJS.y
diff --git a/src-3.0/GF/JavaScript/PrintJS.hs b/src/GF/JavaScript/PrintJS.hs
index 4e04e3cbf..4e04e3cbf 100644
--- a/src-3.0/GF/JavaScript/PrintJS.hs
+++ b/src/GF/JavaScript/PrintJS.hs
diff --git a/src-3.0/GF/Source/AbsGF.hs b/src/GF/Source/AbsGF.hs
index 86e521318..86e521318 100644
--- a/src-3.0/GF/Source/AbsGF.hs
+++ b/src/GF/Source/AbsGF.hs
diff --git a/src-3.0/GF/Source/ErrM.hs b/src/GF/Source/ErrM.hs
index addd22f69..addd22f69 100644
--- a/src-3.0/GF/Source/ErrM.hs
+++ b/src/GF/Source/ErrM.hs
diff --git a/src-3.0/GF/Source/GF.cf b/src/GF/Source/GF.cf
index ef458c91a..ef458c91a 100644
--- a/src-3.0/GF/Source/GF.cf
+++ b/src/GF/Source/GF.cf
diff --git a/src-3.0/GF/Source/GrammarToSource.hs b/src/GF/Source/GrammarToSource.hs
index f76fe6cee..f76fe6cee 100644
--- a/src-3.0/GF/Source/GrammarToSource.hs
+++ b/src/GF/Source/GrammarToSource.hs
diff --git a/src-3.0/GF/Source/LexGF.hs b/src/GF/Source/LexGF.hs
index 1a2e507be..1a2e507be 100644
--- a/src-3.0/GF/Source/LexGF.hs
+++ b/src/GF/Source/LexGF.hs
diff --git a/src-3.0/GF/Source/LexGF.x b/src/GF/Source/LexGF.x
index 15671c9de..15671c9de 100644
--- a/src-3.0/GF/Source/LexGF.x
+++ b/src/GF/Source/LexGF.x
diff --git a/src-3.0/GF/Source/ParGF.hs b/src/GF/Source/ParGF.hs
index 863e6c7e9..863e6c7e9 100644
--- a/src-3.0/GF/Source/ParGF.hs
+++ b/src/GF/Source/ParGF.hs
diff --git a/src-3.0/GF/Source/ParGF.y b/src/GF/Source/ParGF.y
index 22a15cd93..22a15cd93 100644
--- a/src-3.0/GF/Source/ParGF.y
+++ b/src/GF/Source/ParGF.y
diff --git a/src-3.0/GF/Source/PrintGF.hs b/src/GF/Source/PrintGF.hs
index ea2277e67..ea2277e67 100644
--- a/src-3.0/GF/Source/PrintGF.hs
+++ b/src/GF/Source/PrintGF.hs
diff --git a/src-3.0/GF/Source/SharedString.hs b/src/GF/Source/SharedString.hs
index 732873fe6..732873fe6 100644
--- a/src-3.0/GF/Source/SharedString.hs
+++ b/src/GF/Source/SharedString.hs
diff --git a/src-3.0/GF/Source/SourceToGrammar.hs b/src/GF/Source/SourceToGrammar.hs
index e80219f30..e80219f30 100644
--- a/src-3.0/GF/Source/SourceToGrammar.hs
+++ b/src/GF/Source/SourceToGrammar.hs
diff --git a/src-3.0/GF/Speech/CFG.hs b/src/GF/Speech/CFG.hs
index 5b2a0f2ca..5b2a0f2ca 100644
--- a/src-3.0/GF/Speech/CFG.hs
+++ b/src/GF/Speech/CFG.hs
diff --git a/src-3.0/GF/Speech/CFGToFA.hs b/src/GF/Speech/CFGToFA.hs
index 1ac4bd24e..1ac4bd24e 100644
--- a/src-3.0/GF/Speech/CFGToFA.hs
+++ b/src/GF/Speech/CFGToFA.hs
diff --git a/src-3.0/GF/Speech/FiniteState.hs b/src/GF/Speech/FiniteState.hs
index c809eb544..c809eb544 100644
--- a/src-3.0/GF/Speech/FiniteState.hs
+++ b/src/GF/Speech/FiniteState.hs
diff --git a/src-3.0/GF/Speech/GSL.hs b/src/GF/Speech/GSL.hs
index 637552bf4..637552bf4 100644
--- a/src-3.0/GF/Speech/GSL.hs
+++ b/src/GF/Speech/GSL.hs
diff --git a/src-3.0/GF/Speech/Graph.hs b/src/GF/Speech/Graph.hs
index 1a0ebe0c0..1a0ebe0c0 100644
--- a/src-3.0/GF/Speech/Graph.hs
+++ b/src/GF/Speech/Graph.hs
diff --git a/src-3.0/GF/Speech/Graphviz.hs b/src/GF/Speech/Graphviz.hs
index 1851fcb64..1851fcb64 100644
--- a/src-3.0/GF/Speech/Graphviz.hs
+++ b/src/GF/Speech/Graphviz.hs
diff --git a/src-3.0/GF/Speech/JSGF.hs b/src/GF/Speech/JSGF.hs
index dc9f4170a..dc9f4170a 100644
--- a/src-3.0/GF/Speech/JSGF.hs
+++ b/src/GF/Speech/JSGF.hs
diff --git a/src-3.0/GF/Speech/PGFToCFG.hs b/src/GF/Speech/PGFToCFG.hs
index 1f3ebaeb4..1f3ebaeb4 100644
--- a/src-3.0/GF/Speech/PGFToCFG.hs
+++ b/src/GF/Speech/PGFToCFG.hs
diff --git a/src-3.0/GF/Speech/PrRegExp.hs b/src/GF/Speech/PrRegExp.hs
index ae450dee8..ae450dee8 100644
--- a/src-3.0/GF/Speech/PrRegExp.hs
+++ b/src/GF/Speech/PrRegExp.hs
diff --git a/src-3.0/GF/Speech/RegExp.hs b/src/GF/Speech/RegExp.hs
index 5ee40828e..5ee40828e 100644
--- a/src-3.0/GF/Speech/RegExp.hs
+++ b/src/GF/Speech/RegExp.hs
diff --git a/src-3.0/GF/Speech/Relation.hs b/src/GF/Speech/Relation.hs
index 641d671a9..641d671a9 100644
--- a/src-3.0/GF/Speech/Relation.hs
+++ b/src/GF/Speech/Relation.hs
diff --git a/src-3.0/GF/Speech/SISR.hs b/src/GF/Speech/SISR.hs
index 723dc1a49..723dc1a49 100644
--- a/src-3.0/GF/Speech/SISR.hs
+++ b/src/GF/Speech/SISR.hs
diff --git a/src-3.0/GF/Speech/SLF.hs b/src/GF/Speech/SLF.hs
index 4bdc05212..4bdc05212 100644
--- a/src-3.0/GF/Speech/SLF.hs
+++ b/src/GF/Speech/SLF.hs
diff --git a/src-3.0/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index a861d889d..a861d889d 100644
--- a/src-3.0/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
diff --git a/src-3.0/GF/Speech/SRGS_XML.hs b/src/GF/Speech/SRGS_XML.hs
index 33e2d0374..33e2d0374 100644
--- a/src-3.0/GF/Speech/SRGS_XML.hs
+++ b/src/GF/Speech/SRGS_XML.hs
diff --git a/src-3.0/GF/Speech/VoiceXML.hs b/src/GF/Speech/VoiceXML.hs
index 14a93c796..14a93c796 100644
--- a/src-3.0/GF/Speech/VoiceXML.hs
+++ b/src/GF/Speech/VoiceXML.hs
diff --git a/src-3.0/GF/System/NoReadline.hs b/src/GF/System/NoReadline.hs
index 1f1050e8c..1f1050e8c 100644
--- a/src-3.0/GF/System/NoReadline.hs
+++ b/src/GF/System/NoReadline.hs
diff --git a/src-3.0/GF/System/NoSignal.hs b/src/GF/System/NoSignal.hs
index 5d82a431e..5d82a431e 100644
--- a/src-3.0/GF/System/NoSignal.hs
+++ b/src/GF/System/NoSignal.hs
diff --git a/src-3.0/GF/System/Readline.hs b/src/GF/System/Readline.hs
index db122c3e2..db122c3e2 100644
--- a/src-3.0/GF/System/Readline.hs
+++ b/src/GF/System/Readline.hs
diff --git a/src-3.0/GF/System/Signal.hs b/src/GF/System/Signal.hs
index fe8a12483..fe8a12483 100644
--- a/src-3.0/GF/System/Signal.hs
+++ b/src/GF/System/Signal.hs
diff --git a/src-3.0/GF/System/UseReadline.hs b/src/GF/System/UseReadline.hs
index a0e051601..a0e051601 100644
--- a/src-3.0/GF/System/UseReadline.hs
+++ b/src/GF/System/UseReadline.hs
diff --git a/src-3.0/GF/System/UseSignal.hs b/src/GF/System/UseSignal.hs
index 628f5888d..628f5888d 100644
--- a/src-3.0/GF/System/UseSignal.hs
+++ b/src/GF/System/UseSignal.hs
diff --git a/src-3.0/GF/Text/Lexing.hs b/src/GF/Text/Lexing.hs
index 2c6b417b8..2c6b417b8 100644
--- a/src-3.0/GF/Text/Lexing.hs
+++ b/src/GF/Text/Lexing.hs
diff --git a/src-3.0/GF/Text/Transliterations.hs b/src/GF/Text/Transliterations.hs
index 30c098df8..30c098df8 100644
--- a/src-3.0/GF/Text/Transliterations.hs
+++ b/src/GF/Text/Transliterations.hs
diff --git a/src-3.0/GF/Text/UTF8.hs b/src/GF/Text/UTF8.hs
index 5e9687684..5e9687684 100644
--- a/src-3.0/GF/Text/UTF8.hs
+++ b/src/GF/Text/UTF8.hs
diff --git a/src-3.0/GFC.hs b/src/GFC.hs
index 17c95eb30..17c95eb30 100644
--- a/src-3.0/GFC.hs
+++ b/src/GFC.hs
diff --git a/src-3.0/GFI.hs b/src/GFI.hs
index 8bcc7df14..8bcc7df14 100644
--- a/src-3.0/GFI.hs
+++ b/src/GFI.hs
diff --git a/src-3.0/HelpFile b/src/HelpFile
index c6b38b313..c6b38b313 100644
--- a/src-3.0/HelpFile
+++ b/src/HelpFile
diff --git a/src-3.0/INSTALL b/src/INSTALL
index ef7949b07..ef7949b07 100644
--- a/src-3.0/INSTALL
+++ b/src/INSTALL
diff --git a/src-3.0/INSTALL.binary b/src/INSTALL.binary
index ef62b24af..ef62b24af 100644
--- a/src-3.0/INSTALL.binary
+++ b/src/INSTALL.binary
diff --git a/src-3.0/JavaGUI/DynamicTree.java b/src/JavaGUI/DynamicTree.java
index 6acc6ff64..6acc6ff64 100644
--- a/src-3.0/JavaGUI/DynamicTree.java
+++ b/src/JavaGUI/DynamicTree.java
diff --git a/src-3.0/JavaGUI/DynamicTree2.java b/src/JavaGUI/DynamicTree2.java
index 9d325772d..9d325772d 100644
--- a/src-3.0/JavaGUI/DynamicTree2.java
+++ b/src/JavaGUI/DynamicTree2.java
diff --git a/src-3.0/JavaGUI/GFEditor.java b/src/JavaGUI/GFEditor.java
index 0ebf91e7e..0ebf91e7e 100644
--- a/src-3.0/JavaGUI/GFEditor.java
+++ b/src/JavaGUI/GFEditor.java
diff --git a/src-3.0/JavaGUI/GFEditor2.java b/src/JavaGUI/GFEditor2.java
index f71210d7c..f71210d7c 100644
--- a/src-3.0/JavaGUI/GFEditor2.java
+++ b/src/JavaGUI/GFEditor2.java
diff --git a/src-3.0/JavaGUI/GrammarFilter.java b/src/JavaGUI/GrammarFilter.java
index 5180a9f6e..5180a9f6e 100644
--- a/src-3.0/JavaGUI/GrammarFilter.java
+++ b/src/JavaGUI/GrammarFilter.java
diff --git a/src-3.0/JavaGUI/LinPosition.java b/src/JavaGUI/LinPosition.java
index 2419de1df..2419de1df 100644
--- a/src-3.0/JavaGUI/LinPosition.java
+++ b/src/JavaGUI/LinPosition.java
diff --git a/src-3.0/JavaGUI/MarkedArea.java b/src/JavaGUI/MarkedArea.java
index 3299db9aa..3299db9aa 100644
--- a/src-3.0/JavaGUI/MarkedArea.java
+++ b/src/JavaGUI/MarkedArea.java
diff --git a/src-3.0/JavaGUI/Numerals.java b/src/JavaGUI/Numerals.java
index 752cf232c..752cf232c 100644
--- a/src-3.0/JavaGUI/Numerals.java
+++ b/src/JavaGUI/Numerals.java
diff --git a/src-3.0/JavaGUI/Utils.java b/src/JavaGUI/Utils.java
index b10f54712..b10f54712 100644
--- a/src-3.0/JavaGUI/Utils.java
+++ b/src/JavaGUI/Utils.java
diff --git a/src-3.0/JavaGUI/manifest.txt b/src/JavaGUI/manifest.txt
index 006d8adfd..006d8adfd 100644
--- a/src-3.0/JavaGUI/manifest.txt
+++ b/src/JavaGUI/manifest.txt
diff --git a/src-3.0/JavaGUI/runNumerals b/src/JavaGUI/runNumerals
index 3445220cc..3445220cc 100644
--- a/src-3.0/JavaGUI/runNumerals
+++ b/src/JavaGUI/runNumerals
diff --git a/src-3.0/JavaGUI2/LICENCE_jargs b/src/JavaGUI2/LICENCE_jargs
index 509c1b7cb..509c1b7cb 100644
--- a/src-3.0/JavaGUI2/LICENCE_jargs
+++ b/src/JavaGUI2/LICENCE_jargs
diff --git a/src-3.0/JavaGUI2/ManifestMain.txt b/src/JavaGUI2/ManifestMain.txt
index b398ff78d..b398ff78d 100644
--- a/src-3.0/JavaGUI2/ManifestMain.txt
+++ b/src/JavaGUI2/ManifestMain.txt
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
index 0439ec6a4..0439ec6a4 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AbstractProber.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
index 9a4c48911..9a4c48911 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/AstNodeData.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
index c0f6f0c0d..c0f6f0c0d 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ChainCommandTuple.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
index 3a9432960..3a9432960 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ConstraintCallback.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
index 9ca39fc49..9ca39fc49 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Display.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
index 5c88955d3..5c88955d3 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/DynamicTree2.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
index 076a9778f..076a9778f 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ExportFormatMenu.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
index 6e420a62b..6e420a62b 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFCommand.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
index cdda74168..cdda74168 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
index 8912d0778..8912d0778 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfAstNode.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
index c1d012a02..c1d012a02 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfCapsule.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
index ccc75ff26..ccc75ff26 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GfeditResult.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
index e8bd59c66..e8bd59c66 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GrammarFilter.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
index 0a640f787..0a640f787 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Hmsg.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
index d047b943b..d047b943b 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/InputCommand.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
index 39e3e6fb1..39e3e6fb1 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LanguageManager.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
index cf2963210..cf2963210 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinPosition.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
index 5ff78202b..5ff78202b 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Linearization.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
index fb12c79b7..fb12c79b7 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/LinkCommand.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
index 0f4422978..0f4422978 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedArea.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
index f2c712a75..f2c712a75 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/MarkedAreaHighlightingStatus.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
index 44880a00a..44880a00a 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/NewCategoryMenuResult.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
index f241acb69..f241acb69 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/NoLineBreakFormatter.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
index 68feb6dd9..68feb6dd9 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Printname.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
index 2cf5e9daa..2cf5e9daa 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameLoader.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
index 685dcf000..685dcf000 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/PrintnameManager.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
index 3a0ea34f4..3a0ea34f4 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ReadDialog.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
index 8d9b4f3f8..8d9b4f3f8 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RealCommand.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
index bfd526593..bfd526593 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinedAstNodeData.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
index 46e4a2443..46e4a2443 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenu.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
index 4d7df9dac..4d7df9dac 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuCollector.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
index ba1263db8..ba1263db8 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/RefinementMenuTransformer.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
index 60ee86c64..60ee86c64 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfPropertiesCommand.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
index 664a9d918..664a9d918 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SelfResultProber.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
index 67f4326e1..67f4326e1 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/StringTuple.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
index 9ff3c4f92..9ff3c4f92 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/SubtypingProber.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
index b05aeeb87..b05aeeb87 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/ToolTipCellRenderer.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
index 5edf2a16b..5edf2a16b 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalyser.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
index 1bcae3421..1bcae3421 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TreeAnalysisResult.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
index 5cf5c4bd5..5cf5c4bd5 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/TypesLoader.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
index 0c12fc0fb..0c12fc0fb 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/UnrefinedAstNodeData.java
diff --git a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
index 076cc2308..076cc2308 100644
--- a/src-3.0/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/Utils.java
diff --git a/src-3.0/JavaGUI2/gf-icon.gif b/src/JavaGUI2/gf-icon.gif
index 5e8863d76..5e8863d76 100644
--- a/src-3.0/JavaGUI2/gf-icon.gif
+++ b/src/JavaGUI2/gf-icon.gif
diff --git a/src-3.0/JavaGUI2/jargs-1.0.jar b/src/JavaGUI2/jargs-1.0.jar
index cdbc80bb3..cdbc80bb3 100644
--- a/src-3.0/JavaGUI2/jargs-1.0.jar
+++ b/src/JavaGUI2/jargs-1.0.jar
diff --git a/src-3.0/Makefile b/src/Makefile
index 08de81434..08de81434 100644
--- a/src-3.0/Makefile
+++ b/src/Makefile
diff --git a/src-3.0/Makefile.binary b/src/Makefile.binary
index ab52185fd..ab52185fd 100644
--- a/src-3.0/Makefile.binary
+++ b/src/Makefile.binary
diff --git a/src-3.0/PGF.hs b/src/PGF.hs
index 8add3d1d8..8add3d1d8 100644
--- a/src-3.0/PGF.hs
+++ b/src/PGF.hs
diff --git a/src-3.0/PGF/BuildParser.hs b/src/PGF/BuildParser.hs
index 9dfab3130..9dfab3130 100644
--- a/src-3.0/PGF/BuildParser.hs
+++ b/src/PGF/BuildParser.hs
diff --git a/src-3.0/PGF/CId.hs b/src/PGF/CId.hs
index 161529308..161529308 100644
--- a/src-3.0/PGF/CId.hs
+++ b/src/PGF/CId.hs
diff --git a/src-3.0/PGF/Check.hs b/src/PGF/Check.hs
index f66b9189d..f66b9189d 100644
--- a/src-3.0/PGF/Check.hs
+++ b/src/PGF/Check.hs
diff --git a/src-3.0/PGF/Data.hs b/src/PGF/Data.hs
index 3f9aaa6ab..3f9aaa6ab 100644
--- a/src-3.0/PGF/Data.hs
+++ b/src/PGF/Data.hs
diff --git a/src-3.0/PGF/Expr.hs b/src/PGF/Expr.hs
index 51a076d36..51a076d36 100644
--- a/src-3.0/PGF/Expr.hs
+++ b/src/PGF/Expr.hs
diff --git a/src-3.0/PGF/Generate.hs b/src/PGF/Generate.hs
index 64ca4d5f5..64ca4d5f5 100644
--- a/src-3.0/PGF/Generate.hs
+++ b/src/PGF/Generate.hs
diff --git a/src-3.0/PGF/Linearize.hs b/src/PGF/Linearize.hs
index 5bc40438f..5bc40438f 100644
--- a/src-3.0/PGF/Linearize.hs
+++ b/src/PGF/Linearize.hs
diff --git a/src-3.0/PGF/Macros.hs b/src/PGF/Macros.hs
index bb5e8188b..bb5e8188b 100644
--- a/src-3.0/PGF/Macros.hs
+++ b/src/PGF/Macros.hs
diff --git a/src-3.0/PGF/Morphology.hs b/src/PGF/Morphology.hs
index 2eb793d73..2eb793d73 100644
--- a/src-3.0/PGF/Morphology.hs
+++ b/src/PGF/Morphology.hs
diff --git a/src-3.0/PGF/Parsing/FCFG.hs b/src/PGF/Parsing/FCFG.hs
index 4ca6a956a..4ca6a956a 100644
--- a/src-3.0/PGF/Parsing/FCFG.hs
+++ b/src/PGF/Parsing/FCFG.hs
diff --git a/src-3.0/PGF/Parsing/FCFG/Active.hs b/src/PGF/Parsing/FCFG/Active.hs
index 4386bfdd1..4386bfdd1 100644
--- a/src-3.0/PGF/Parsing/FCFG/Active.hs
+++ b/src/PGF/Parsing/FCFG/Active.hs
diff --git a/src-3.0/PGF/Parsing/FCFG/Incremental.hs b/src/PGF/Parsing/FCFG/Incremental.hs
index fff5f0212..fff5f0212 100644
--- a/src-3.0/PGF/Parsing/FCFG/Incremental.hs
+++ b/src/PGF/Parsing/FCFG/Incremental.hs
diff --git a/src-3.0/PGF/Parsing/FCFG/Utilities.hs b/src/PGF/Parsing/FCFG/Utilities.hs
index 4187d0f24..4187d0f24 100644
--- a/src-3.0/PGF/Parsing/FCFG/Utilities.hs
+++ b/src/PGF/Parsing/FCFG/Utilities.hs
diff --git a/src-3.0/PGF/Quiz.hs b/src/PGF/Quiz.hs
index 7f5bae201..7f5bae201 100644
--- a/src-3.0/PGF/Quiz.hs
+++ b/src/PGF/Quiz.hs
diff --git a/src-3.0/PGF/Raw/Abstract.hs b/src/PGF/Raw/Abstract.hs
index 77d919a2d..77d919a2d 100644
--- a/src-3.0/PGF/Raw/Abstract.hs
+++ b/src/PGF/Raw/Abstract.hs
diff --git a/src-3.0/PGF/Raw/Convert.hs b/src/PGF/Raw/Convert.hs
index af3708eb5..af3708eb5 100644
--- a/src-3.0/PGF/Raw/Convert.hs
+++ b/src/PGF/Raw/Convert.hs
diff --git a/src-3.0/PGF/Raw/Parse.hs b/src/PGF/Raw/Parse.hs
index 671183ba4..671183ba4 100644
--- a/src-3.0/PGF/Raw/Parse.hs
+++ b/src/PGF/Raw/Parse.hs
diff --git a/src-3.0/PGF/Raw/Print.hs b/src/PGF/Raw/Print.hs
index d34adbc2b..d34adbc2b 100644
--- a/src-3.0/PGF/Raw/Print.hs
+++ b/src/PGF/Raw/Print.hs
diff --git a/src-3.0/PGF/ShowLinearize.hs b/src/PGF/ShowLinearize.hs
index 663264d63..663264d63 100644
--- a/src-3.0/PGF/ShowLinearize.hs
+++ b/src/PGF/ShowLinearize.hs
diff --git a/src-3.0/PGF/VisualizeTree.hs b/src/PGF/VisualizeTree.hs
index 0219dcbde..0219dcbde 100644
--- a/src-3.0/PGF/VisualizeTree.hs
+++ b/src/PGF/VisualizeTree.hs
diff --git a/src-3.0/PGF/doc/Eng.gf b/src/PGF/doc/Eng.gf
index c64f46313..c64f46313 100644
--- a/src-3.0/PGF/doc/Eng.gf
+++ b/src/PGF/doc/Eng.gf
diff --git a/src-3.0/PGF/doc/Ex.gf b/src/PGF/doc/Ex.gf
index bd0b03483..bd0b03483 100644
--- a/src-3.0/PGF/doc/Ex.gf
+++ b/src/PGF/doc/Ex.gf
diff --git a/src-3.0/PGF/doc/Swe.gf b/src/PGF/doc/Swe.gf
index 1d6672371..1d6672371 100644
--- a/src-3.0/PGF/doc/Swe.gf
+++ b/src/PGF/doc/Swe.gf
diff --git a/src-3.0/PGF/doc/Test.gf b/src/PGF/doc/Test.gf
index 5cd4c5474..5cd4c5474 100644
--- a/src-3.0/PGF/doc/Test.gf
+++ b/src/PGF/doc/Test.gf
diff --git a/src-3.0/PGF/doc/gfcc.html b/src/PGF/doc/gfcc.html
index 8f8c478c0..8f8c478c0 100644
--- a/src-3.0/PGF/doc/gfcc.html
+++ b/src/PGF/doc/gfcc.html
diff --git a/src-3.0/PGF/doc/gfcc.txt b/src/PGF/doc/gfcc.txt
index 5dcf2fbdc..5dcf2fbdc 100644
--- a/src-3.0/PGF/doc/gfcc.txt
+++ b/src/PGF/doc/gfcc.txt
diff --git a/src-3.0/PGF/doc/old-GFCC.cf b/src/PGF/doc/old-GFCC.cf
index 65657a259..65657a259 100644
--- a/src-3.0/PGF/doc/old-GFCC.cf
+++ b/src/PGF/doc/old-GFCC.cf
diff --git a/src-3.0/PGF/doc/old-gfcc.txt b/src/PGF/doc/old-gfcc.txt
index 6ffd9bd64..6ffd9bd64 100644
--- a/src-3.0/PGF/doc/old-gfcc.txt
+++ b/src/PGF/doc/old-gfcc.txt
diff --git a/src-3.0/PGF/doc/syntax.txt b/src/PGF/doc/syntax.txt
index db8f7c149..db8f7c149 100644
--- a/src-3.0/PGF/doc/syntax.txt
+++ b/src/PGF/doc/syntax.txt
diff --git a/src-3.0/ReleaseProcedure b/src/ReleaseProcedure
index c04f2a065..c04f2a065 100644
--- a/src-3.0/ReleaseProcedure
+++ b/src/ReleaseProcedure
diff --git a/src-3.0/Transfer/CompilerAPI.hs b/src/Transfer/CompilerAPI.hs
index 38cb58dd0..38cb58dd0 100644
--- a/src-3.0/Transfer/CompilerAPI.hs
+++ b/src/Transfer/CompilerAPI.hs
diff --git a/src-3.0/Transfer/Core/Abs.hs b/src/Transfer/Core/Abs.hs
index 8306d5b46..8306d5b46 100644
--- a/src-3.0/Transfer/Core/Abs.hs
+++ b/src/Transfer/Core/Abs.hs
diff --git a/src-3.0/Transfer/Core/Core.cf b/src/Transfer/Core/Core.cf
index cd4c20569..cd4c20569 100644
--- a/src-3.0/Transfer/Core/Core.cf
+++ b/src/Transfer/Core/Core.cf
diff --git a/src-3.0/Transfer/Core/Doc.tex b/src/Transfer/Core/Doc.tex
index 4ba6f93ed..4ba6f93ed 100644
--- a/src-3.0/Transfer/Core/Doc.tex
+++ b/src/Transfer/Core/Doc.tex
diff --git a/src-3.0/Transfer/Core/Lex.hs b/src/Transfer/Core/Lex.hs
index be1198508..be1198508 100644
--- a/src-3.0/Transfer/Core/Lex.hs
+++ b/src/Transfer/Core/Lex.hs
diff --git a/src-3.0/Transfer/Core/Lex.x b/src/Transfer/Core/Lex.x
index 480f366ae..480f366ae 100644
--- a/src-3.0/Transfer/Core/Lex.x
+++ b/src/Transfer/Core/Lex.x
diff --git a/src-3.0/Transfer/Core/Par.hs b/src/Transfer/Core/Par.hs
index fec63662a..fec63662a 100644
--- a/src-3.0/Transfer/Core/Par.hs
+++ b/src/Transfer/Core/Par.hs
diff --git a/src-3.0/Transfer/Core/Par.y b/src/Transfer/Core/Par.y
index ceeaa313f..ceeaa313f 100644
--- a/src-3.0/Transfer/Core/Par.y
+++ b/src/Transfer/Core/Par.y
diff --git a/src-3.0/Transfer/Core/Print.hs b/src/Transfer/Core/Print.hs
index 50929716a..50929716a 100644
--- a/src-3.0/Transfer/Core/Print.hs
+++ b/src/Transfer/Core/Print.hs
diff --git a/src-3.0/Transfer/Core/Skel.hs b/src/Transfer/Core/Skel.hs
index 005ae92b1..005ae92b1 100644
--- a/src-3.0/Transfer/Core/Skel.hs
+++ b/src/Transfer/Core/Skel.hs
diff --git a/src-3.0/Transfer/Core/Test.hs b/src/Transfer/Core/Test.hs
index 570beed51..570beed51 100644
--- a/src-3.0/Transfer/Core/Test.hs
+++ b/src/Transfer/Core/Test.hs
diff --git a/src-3.0/Transfer/ErrM.hs b/src/Transfer/ErrM.hs
index 1f3c566fd..1f3c566fd 100644
--- a/src-3.0/Transfer/ErrM.hs
+++ b/src/Transfer/ErrM.hs
diff --git a/src-3.0/Transfer/Interpreter.hs b/src/Transfer/Interpreter.hs
index 926b7bd3a..926b7bd3a 100644
--- a/src-3.0/Transfer/Interpreter.hs
+++ b/src/Transfer/Interpreter.hs
diff --git a/src-3.0/Transfer/InterpreterAPI.hs b/src/Transfer/InterpreterAPI.hs
index 2fe04e8f3..2fe04e8f3 100644
--- a/src-3.0/Transfer/InterpreterAPI.hs
+++ b/src/Transfer/InterpreterAPI.hs
diff --git a/src-3.0/Transfer/PathUtil.hs b/src/Transfer/PathUtil.hs
index b344563c6..b344563c6 100644
--- a/src-3.0/Transfer/PathUtil.hs
+++ b/src/Transfer/PathUtil.hs
diff --git a/src-3.0/Transfer/Syntax/Abs.hs b/src/Transfer/Syntax/Abs.hs
index 0ccf9ab12..0ccf9ab12 100644
--- a/src-3.0/Transfer/Syntax/Abs.hs
+++ b/src/Transfer/Syntax/Abs.hs
diff --git a/src-3.0/Transfer/Syntax/Doc.tex b/src/Transfer/Syntax/Doc.tex
index 603940459..603940459 100644
--- a/src-3.0/Transfer/Syntax/Doc.tex
+++ b/src/Transfer/Syntax/Doc.tex
diff --git a/src-3.0/Transfer/Syntax/Layout.hs b/src/Transfer/Syntax/Layout.hs
index de5c99870..de5c99870 100644
--- a/src-3.0/Transfer/Syntax/Layout.hs
+++ b/src/Transfer/Syntax/Layout.hs
diff --git a/src-3.0/Transfer/Syntax/Lex.hs b/src/Transfer/Syntax/Lex.hs
index 83c9e1a12..83c9e1a12 100644
--- a/src-3.0/Transfer/Syntax/Lex.hs
+++ b/src/Transfer/Syntax/Lex.hs
diff --git a/src-3.0/Transfer/Syntax/Lex.x b/src/Transfer/Syntax/Lex.x
index 107b67345..107b67345 100644
--- a/src-3.0/Transfer/Syntax/Lex.x
+++ b/src/Transfer/Syntax/Lex.x
diff --git a/src-3.0/Transfer/Syntax/Par.hs b/src/Transfer/Syntax/Par.hs
index bd83f0a87..bd83f0a87 100644
--- a/src-3.0/Transfer/Syntax/Par.hs
+++ b/src/Transfer/Syntax/Par.hs
diff --git a/src-3.0/Transfer/Syntax/Par.y b/src/Transfer/Syntax/Par.y
index 13c7800a8..13c7800a8 100644
--- a/src-3.0/Transfer/Syntax/Par.y
+++ b/src/Transfer/Syntax/Par.y
diff --git a/src-3.0/Transfer/Syntax/Print.hs b/src/Transfer/Syntax/Print.hs
index 50164477d..50164477d 100644
--- a/src-3.0/Transfer/Syntax/Print.hs
+++ b/src/Transfer/Syntax/Print.hs
diff --git a/src-3.0/Transfer/Syntax/ResolveLayout.hs b/src/Transfer/Syntax/ResolveLayout.hs
index 9d7ab607a..9d7ab607a 100644
--- a/src-3.0/Transfer/Syntax/ResolveLayout.hs
+++ b/src/Transfer/Syntax/ResolveLayout.hs
diff --git a/src-3.0/Transfer/Syntax/Skel.hs b/src/Transfer/Syntax/Skel.hs
index b2376478b..b2376478b 100644
--- a/src-3.0/Transfer/Syntax/Skel.hs
+++ b/src/Transfer/Syntax/Skel.hs
diff --git a/src-3.0/Transfer/Syntax/Syntax.cf b/src/Transfer/Syntax/Syntax.cf
index 7429e34f9..7429e34f9 100644
--- a/src-3.0/Transfer/Syntax/Syntax.cf
+++ b/src/Transfer/Syntax/Syntax.cf
diff --git a/src-3.0/Transfer/Syntax/Test.hs b/src/Transfer/Syntax/Test.hs
index 3f5fab7ad..3f5fab7ad 100644
--- a/src-3.0/Transfer/Syntax/Test.hs
+++ b/src/Transfer/Syntax/Test.hs
diff --git a/src-3.0/Transfer/SyntaxToCore.hs b/src/Transfer/SyntaxToCore.hs
index 32796eb50..32796eb50 100644
--- a/src-3.0/Transfer/SyntaxToCore.hs
+++ b/src/Transfer/SyntaxToCore.hs
diff --git a/src-3.0/config.guess b/src/config.guess
index c085f4f51..c085f4f51 100644
--- a/src-3.0/config.guess
+++ b/src/config.guess
diff --git a/src-3.0/config.mk.in b/src/config.mk.in
index e8a8ab567..e8a8ab567 100644
--- a/src-3.0/config.mk.in
+++ b/src/config.mk.in
diff --git a/src-3.0/config.sub b/src/config.sub
index 4d936e239..4d936e239 100644
--- a/src-3.0/config.sub
+++ b/src/config.sub
diff --git a/src-3.0/configure.ac b/src/configure.ac
index 5e82d71d1..5e82d71d1 100644
--- a/src-3.0/configure.ac
+++ b/src/configure.ac
diff --git a/src-3.0/exper/Evaluate.hs b/src/exper/Evaluate.hs
index 7c5fb4b6a..7c5fb4b6a 100644
--- a/src-3.0/exper/Evaluate.hs
+++ b/src/exper/Evaluate.hs
diff --git a/src-3.0/exper/Optimize.hs b/src/exper/Optimize.hs
index 93346bc70..93346bc70 100644
--- a/src-3.0/exper/Optimize.hs
+++ b/src/exper/Optimize.hs
diff --git a/src-3.0/gf.spec b/src/gf.spec
index b46b9be62..b46b9be62 100644
--- a/src-3.0/gf.spec
+++ b/src/gf.spec
diff --git a/src-3.0/gf.wxs.in b/src/gf.wxs.in
index e2b21f12b..e2b21f12b 100644
--- a/src-3.0/gf.wxs.in
+++ b/src/gf.wxs.in
diff --git a/src-3.0/gf_atk.cfg b/src/gf_atk.cfg
index 37bb2c4f5..37bb2c4f5 100644
--- a/src-3.0/gf_atk.cfg
+++ b/src/gf_atk.cfg
diff --git a/src-3.0/gfc.in b/src/gfc.in
index 05addb2cb..05addb2cb 100644
--- a/src-3.0/gfc.in
+++ b/src/gfc.in
diff --git a/src-3.0/gfeditor.in b/src/gfeditor.in
index 129cd5e1f..129cd5e1f 100644
--- a/src-3.0/gfeditor.in
+++ b/src/gfeditor.in
diff --git a/src-3.0/haddock/haddock-check.perl b/src/haddock/haddock-check.perl
index 93647bac7..93647bac7 100644
--- a/src-3.0/haddock/haddock-check.perl
+++ b/src/haddock/haddock-check.perl
diff --git a/src-3.0/haddock/haddock-script.csh b/src/haddock/haddock-script.csh
index 77b3761f8..77b3761f8 100644
--- a/src-3.0/haddock/haddock-script.csh
+++ b/src/haddock/haddock-script.csh
diff --git a/src-3.0/haddock/resources/blank.html b/src/haddock/resources/blank.html
index 63ab0b172..63ab0b172 100644
--- a/src-3.0/haddock/resources/blank.html
+++ b/src/haddock/resources/blank.html
diff --git a/src-3.0/haddock/resources/index.html b/src/haddock/resources/index.html
index 5d8822dc5..5d8822dc5 100644
--- a/src-3.0/haddock/resources/index.html
+++ b/src/haddock/resources/index.html
diff --git a/src-3.0/install-sh b/src/install-sh
index e9de23842..e9de23842 100644
--- a/src-3.0/install-sh
+++ b/src/install-sh
diff --git a/src-3.0/jgf.bat b/src/jgf.bat
index d56a638d5..d56a638d5 100644
--- a/src-3.0/jgf.bat
+++ b/src/jgf.bat
diff --git a/src-3.0/jgf.in b/src/jgf.in
index 3df121a64..3df121a64 100644
--- a/src-3.0/jgf.in
+++ b/src/jgf.in
diff --git a/src-3.0/module-structure.txt b/src/module-structure.txt
index d3b596d9f..d3b596d9f 100644
--- a/src-3.0/module-structure.txt
+++ b/src/module-structure.txt
diff --git a/src-3.0/tools/AlphaConvGF.hs b/src/tools/AlphaConvGF.hs
index 0e87bdb7a..0e87bdb7a 100644
--- a/src-3.0/tools/AlphaConvGF.hs
+++ b/src/tools/AlphaConvGF.hs
diff --git a/src-3.0/tools/GFDoc.hs b/src/tools/GFDoc.hs
index 91410864a..91410864a 100644
--- a/src-3.0/tools/GFDoc.hs
+++ b/src/tools/GFDoc.hs
diff --git a/src-3.0/tools/Htmls.hs b/src/tools/Htmls.hs
index ce0b3bb28..ce0b3bb28 100644
--- a/src-3.0/tools/Htmls.hs
+++ b/src/tools/Htmls.hs
diff --git a/src-3.0/tools/MkHelpFile.hs b/src/tools/MkHelpFile.hs
index a0fafa918..a0fafa918 100644
--- a/src-3.0/tools/MkHelpFile.hs
+++ b/src/tools/MkHelpFile.hs
diff --git a/src-3.0/tools/WriteF.hs b/src/tools/WriteF.hs
index 2e5b299dc..2e5b299dc 100644
--- a/src-3.0/tools/WriteF.hs
+++ b/src/tools/WriteF.hs
diff --git a/src-3.0/tools/c++/README b/src/tools/c++/README
index 696e39469..696e39469 100644
--- a/src-3.0/tools/c++/README
+++ b/src/tools/c++/README
diff --git a/src-3.0/tools/c++/exgf.gft b/src/tools/c++/exgf.gft
index 644fecdb9..644fecdb9 100644
--- a/src-3.0/tools/c++/exgf.gft
+++ b/src/tools/c++/exgf.gft
diff --git a/src-3.0/tools/c++/gfex.cpp b/src/tools/c++/gfex.cpp
index 65d65fffb..65d65fffb 100644
--- a/src-3.0/tools/c++/gfex.cpp
+++ b/src/tools/c++/gfex.cpp
diff --git a/src-3.0/tools/c++/peace.gft b/src/tools/c++/peace.gft
index 1e9adf1e5..1e9adf1e5 100644
--- a/src-3.0/tools/c++/peace.gft
+++ b/src/tools/c++/peace.gft
diff --git a/src-3.0/tools/c/GFCC/Abs.hs b/src/tools/c/GFCC/Abs.hs
index f42447ebb..f42447ebb 100644
--- a/src-3.0/tools/c/GFCC/Abs.hs
+++ b/src/tools/c/GFCC/Abs.hs
diff --git a/src-3.0/tools/c/GFCC/ComposOp.hs b/src/tools/c/GFCC/ComposOp.hs
index 401c1d778..401c1d778 100644
--- a/src-3.0/tools/c/GFCC/ComposOp.hs
+++ b/src/tools/c/GFCC/ComposOp.hs
diff --git a/src-3.0/tools/c/GFCC/ErrM.hs b/src/tools/c/GFCC/ErrM.hs
index 820473ccd..820473ccd 100644
--- a/src-3.0/tools/c/GFCC/ErrM.hs
+++ b/src/tools/c/GFCC/ErrM.hs
diff --git a/src-3.0/tools/c/GFCC/Lex.hs b/src/tools/c/GFCC/Lex.hs
index f12c824cd..f12c824cd 100644
--- a/src-3.0/tools/c/GFCC/Lex.hs
+++ b/src/tools/c/GFCC/Lex.hs
diff --git a/src-3.0/tools/c/GFCC/Lex.x b/src/tools/c/GFCC/Lex.x
index f5fda82b6..f5fda82b6 100644
--- a/src-3.0/tools/c/GFCC/Lex.x
+++ b/src/tools/c/GFCC/Lex.x
diff --git a/src-3.0/tools/c/GFCC/Par.hs b/src/tools/c/GFCC/Par.hs
index 1f5479e64..1f5479e64 100644
--- a/src-3.0/tools/c/GFCC/Par.hs
+++ b/src/tools/c/GFCC/Par.hs
diff --git a/src-3.0/tools/c/GFCC/Par.y b/src/tools/c/GFCC/Par.y
index fa30981cb..fa30981cb 100644
--- a/src-3.0/tools/c/GFCC/Par.y
+++ b/src/tools/c/GFCC/Par.y
diff --git a/src-3.0/tools/c/GFCC/Print.hs b/src/tools/c/GFCC/Print.hs
index 3697d8b0f..3697d8b0f 100644
--- a/src-3.0/tools/c/GFCC/Print.hs
+++ b/src/tools/c/GFCC/Print.hs
diff --git a/src-3.0/tools/c/GFCC/Test.hs b/src/tools/c/GFCC/Test.hs
index e3c3bcc40..e3c3bcc40 100644
--- a/src-3.0/tools/c/GFCC/Test.hs
+++ b/src/tools/c/GFCC/Test.hs
diff --git a/src-3.0/tools/c/Makefile b/src/tools/c/Makefile
index 189b224e2..189b224e2 100644
--- a/src-3.0/tools/c/Makefile
+++ b/src/tools/c/Makefile
diff --git a/src-3.0/tools/c/examples/bronzeage/Makefile b/src/tools/c/examples/bronzeage/Makefile
index 67367920a..67367920a 100644
--- a/src-3.0/tools/c/examples/bronzeage/Makefile
+++ b/src/tools/c/examples/bronzeage/Makefile
diff --git a/src-3.0/tools/c/examples/bronzeage/bronzeage-test.c b/src/tools/c/examples/bronzeage/bronzeage-test.c
index c0bee93a2..c0bee93a2 100644
--- a/src-3.0/tools/c/examples/bronzeage/bronzeage-test.c
+++ b/src/tools/c/examples/bronzeage/bronzeage-test.c
diff --git a/src-3.0/tools/c/gfcc2c.hs b/src/tools/c/gfcc2c.hs
index 75eb10fb8..75eb10fb8 100644
--- a/src-3.0/tools/c/gfcc2c.hs
+++ b/src/tools/c/gfcc2c.hs
diff --git a/src-3.0/tools/mkHelpFile.perl b/src/tools/mkHelpFile.perl
index 91f434705..91f434705 100644
--- a/src-3.0/tools/mkHelpFile.perl
+++ b/src/tools/mkHelpFile.perl