diff --git a/lib/src/afrikaans/NumeralAfr.gf b/lib/src/afrikaans/NumeralAfr.gf
index e851a50c2..f257be4dc 100644
--- a/lib/src/afrikaans/NumeralAfr.gf
+++ b/lib/src/afrikaans/NumeralAfr.gf
@@ -58,7 +58,7 @@ lin
     IDig d = d ; 
 
     IIDig d i = {
-      s = \\o => d.s ! invNum ++ i.s ! o ;
+      s = \\o => d.s ! invNum ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/amharic/NumeralAmh.gf b/lib/src/amharic/NumeralAmh.gf
index 01e50b275..c0d8abfb9 100644
--- a/lib/src/amharic/NumeralAmh.gf
+++ b/lib/src/amharic/NumeralAmh.gf
@@ -1,5 +1,5 @@
 
-concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX in {
+concrete NumeralAmh of Numeral = CatAmh ** open ResAmh,ParamX,Prelude in {
 flags coding = utf8;
 lincat 
 
@@ -93,8 +93,8 @@ lin pot3plus n m = {
 
   oper
     commaIf : DTail -> Str = \t -> case t of {
-      T3 => "," ;
-      _ => []
+      T3 => BIND++","++BIND ;
+      _  => BIND
       } ;
 
     inc : DTail -> DTail = \t -> case t of {
diff --git a/lib/src/arabic/NumeralAra.gf b/lib/src/arabic/NumeralAra.gf
index efeec5ddd..daf799a87 100644
--- a/lib/src/arabic/NumeralAra.gf
+++ b/lib/src/arabic/NumeralAra.gf
@@ -121,7 +121,7 @@ lincat
     IDig d = d ;
 
     IIDig d i = {
-      s = d.s ++ i.s;
+      s = d.s ++ BIND ++ i.s;
       n = ThreeTen ;
     } ;
 
diff --git a/lib/src/catalan/NumeralCat.gf b/lib/src/catalan/NumeralCat.gf
index 8c339a837..4f8350ca8 100644
--- a/lib/src/catalan/NumeralCat.gf
+++ b/lib/src/catalan/NumeralCat.gf
@@ -139,7 +139,7 @@ param
     IDig d = d ;
 
     IIDig d i = {
-      s = \\o => d.s ! NCard Masc ++ i.s ! o ;
+      s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/danish/NumeralDan.gf b/lib/src/danish/NumeralDan.gf
index 05587f294..769c000b8 100644
--- a/lib/src/danish/NumeralDan.gf
+++ b/lib/src/danish/NumeralDan.gf
@@ -1,4 +1,4 @@
-concrete NumeralDan of Numeral = CatDan ** open MorphoDan in {
+concrete NumeralDan of Numeral = CatDan ** open MorphoDan,Prelude in {
   flags coding=utf8 ;
 
 
@@ -52,7 +52,7 @@ lin n9 = mkTal "ni"   "nitten"  "halvfems"   "niende" "halvfemsindstyvende" ;
     IDig d = d ; 
 
     IIDig d i = {
-      s = \\o => d.s ! NCard neutrum ++ i.s ! o ;
+      s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/dutch/NumeralDut.gf b/lib/src/dutch/NumeralDut.gf
index 64802ef09..9c7869fe4 100644
--- a/lib/src/dutch/NumeralDut.gf
+++ b/lib/src/dutch/NumeralDut.gf
@@ -57,7 +57,7 @@ lin
     IDig d = d ; 
 
     IIDig d i = {
-      s = \\o => d.s ! invNum ++ i.s ! o ;
+      s = \\o => d.s ! invNum ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/estonian/NumeralEst.gf b/lib/src/estonian/NumeralEst.gf
index 1e2452951..5141ce740 100644
--- a/lib/src/estonian/NumeralEst.gf
+++ b/lib/src/estonian/NumeralEst.gf
@@ -128,7 +128,7 @@ oper
     IDig d = d ;
 
     IIDig d i = {
-      s = \\o => d.s ! NCard (NCase Sg Nom) ++ i.s ! o ;
+      s = \\o => d.s ! NCard (NCase Sg Nom) ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/finnish/NumeralFin.gf b/lib/src/finnish/NumeralFin.gf
index 1fec69e00..f742d81d7 100644
--- a/lib/src/finnish/NumeralFin.gf
+++ b/lib/src/finnish/NumeralFin.gf
@@ -157,7 +157,7 @@ oper
     IDig d = d ; 
 
     IIDig d i = {
-      s = \\o => d.s ! NCard (NCase Sg Nom) ++ i.s ! o ;
+      s = \\o => d.s ! NCard (NCase Sg Nom) ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/french/NumeralFre.gf b/lib/src/french/NumeralFre.gf
index 2a5359d2f..a3cb1d314 100644
--- a/lib/src/french/NumeralFre.gf
+++ b/lib/src/french/NumeralFre.gf
@@ -151,7 +151,7 @@ oper hyphen = BIND ++ "-" ++ BIND ;
     IDig d = d ;
 
     IIDig d i = {
-      s = \\o => d.s ! NCard Masc ++ i.s ! o ;
+      s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/hungarian/NumeralHun.gf b/lib/src/hungarian/NumeralHun.gf
index 5f22f0ae0..680913493 100644
--- a/lib/src/hungarian/NumeralHun.gf
+++ b/lib/src/hungarian/NumeralHun.gf
@@ -71,8 +71,8 @@ concrete NumeralHun of Numeral = CatHun [Numeral,Digits] ** open ResHun in
 --
 --  oper
 --    commaIf : DTail -> Str = \t -> case t of {
---      T3 => "," ;
---      _ => []
+--      T3 => BIND++","++BIND ;
+--      _ => BIND
 --      } ;
 --
 --    inc : DTail -> DTail = \t -> case t of {
diff --git a/lib/src/interlingua/NumeralIna.gf b/lib/src/interlingua/NumeralIna.gf
index e41167d4c..6d03107b2 100644
--- a/lib/src/interlingua/NumeralIna.gf
+++ b/lib/src/interlingua/NumeralIna.gf
@@ -1,4 +1,4 @@
-concrete NumeralIna of Numeral = CatIna ** open ResIna in {
+concrete NumeralIna of Numeral = CatIna ** open ResIna,Prelude in {
 
   lincat 
   Digit = {s : DForm => CardOrd => Str} ;
@@ -68,8 +68,8 @@ concrete NumeralIna of Numeral = CatIna ** open ResIna in {
 
   oper
     commaIf : DTail -> Str = \t -> case t of {
-      T3 => "," ;
-      _ => []
+      T3 => BIND++","++BIND ;
+      _ => BIND
       } ;
 
     inc : DTail -> DTail = \t -> case t of {
diff --git a/lib/src/italian/NumeralIta.gf b/lib/src/italian/NumeralIta.gf
index 5f5e48f84..a0fcf7246 100644
--- a/lib/src/italian/NumeralIta.gf
+++ b/lib/src/italian/NumeralIta.gf
@@ -118,7 +118,7 @@ param Pred = pred | indip ;
     IDig d = d ;
 
     IIDig d i = {
-      s = \\o => d.s ! NCard Masc ++ i.s ! o ;
+      s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/latin/NumeralLat.gf b/lib/src/latin/NumeralLat.gf
index b2dc98e42..ca05f7d4c 100644
--- a/lib/src/latin/NumeralLat.gf
+++ b/lib/src/latin/NumeralLat.gf
@@ -1,4 +1,4 @@
-concrete NumeralLat of Numeral = CatLat ** open ResLat in {
+concrete NumeralLat of Numeral = CatLat ** open ResLat,Prelude in {
 --
 --lincat 
 --  Digit = {s : DForm => CardOrd => Str} ;
@@ -51,7 +51,7 @@ concrete NumeralLat of Numeral = CatLat ** open ResLat in {
     IDig d = {s = d.s ! one; unit = ten} ;
 
     IIDig d i = {
-      s = d.s ! i.unit ++ i.s ;
+      s = d.s ! i.unit ++ BIND ++ i.s ;
       unit = inc i.unit
     } ;
 
diff --git a/lib/src/latvian/NumeralLav.gf b/lib/src/latvian/NumeralLav.gf
index b850b81d9..d4d7e9363 100644
--- a/lib/src/latvian/NumeralLav.gf
+++ b/lib/src/latvian/NumeralLav.gf
@@ -1,6 +1,6 @@
 --# -path=.:abstract:common:prelude
 
-concrete NumeralLav of Numeral = CatLav [Numeral,Digits] ** open ResLav, ParadigmsLav in {
+concrete NumeralLav of Numeral = CatLav [Numeral,Digits] ** open ResLav, ParadigmsLav, Prelude in {
 
 flags coding = utf8 ;
 
@@ -89,7 +89,7 @@ lin
   IDig d = d ;
 
   IIDig d i = {
-    s = \\o => d.s ! NCard ++ i.s ! o ;
+    s = \\o => d.s ! NCard ++ BIND ++ i.s ! o ;
     num = Pl ;	-- FIXME: 1 cilvēks, 11 cilvēki, 21 cilvēks, ...
   } ;
 
diff --git a/lib/src/maltese/NumeralMlt.gf b/lib/src/maltese/NumeralMlt.gf
index 0ba197774..b9d096889 100644
--- a/lib/src/maltese/NumeralMlt.gf
+++ b/lib/src/maltese/NumeralMlt.gf
@@ -380,8 +380,8 @@ concrete NumeralMlt of Numeral = CatMlt [Numeral,Digits] ** open Prelude,ResMlt
 
     -- For correct comma placement in Digits
     commaIf : DTail -> Str = \t -> case t of {
-      T3 => "," ;
-      _ => []
+      T3 => BIND++","++BIND ;
+      _  => BIND
     } ;
     inc : DTail -> DTail = \t -> case t of {
       T1 => T2 ;
diff --git a/lib/src/mongolian/NumeralMon.gf b/lib/src/mongolian/NumeralMon.gf
index df18241e9..d6873ce20 100644
--- a/lib/src/mongolian/NumeralMon.gf
+++ b/lib/src/mongolian/NumeralMon.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common:../prelude
 
-concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon in {
+concrete NumeralMon of Numeral = CatMon ** open ResMon, MorphoMon, Prelude in {
 
  flags  coding=utf8 ;
 
@@ -143,7 +143,7 @@ lin
  IDig d = d ;
 
  IIDig d i = {
-    s = \\co => d.s ! NCard ++ i.s ! co ;
+    s = \\co => d.s ! NCard ++ BIND ++ i.s ! co ;
     n = Pl
     } ;
 
diff --git a/lib/src/norwegian/NumeralNor.gf b/lib/src/norwegian/NumeralNor.gf
index 763e4d533..910bd3242 100644
--- a/lib/src/norwegian/NumeralNor.gf
+++ b/lib/src/norwegian/NumeralNor.gf
@@ -1,4 +1,4 @@
-concrete NumeralNor of Numeral = CatNor ** open MorphoNor in {
+concrete NumeralNor of Numeral = CatNor ** open MorphoNor, Prelude in {
   flags coding=utf8 ;
 
 lincat 
@@ -53,7 +53,7 @@ lin
     IDig d = d ; 
 
     IIDig d i = {
-      s = \\o => d.s ! NCard neutrum ++ i.s ! o ;
+      s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/persian/NumeralPes.gf b/lib/src/persian/NumeralPes.gf
index 7eec9930f..5051074d9 100644
--- a/lib/src/persian/NumeralPes.gf
+++ b/lib/src/persian/NumeralPes.gf
@@ -87,8 +87,8 @@ lin pot3plus n m = {
 
   oper
     commaIf : DTail -> Str = \t -> case t of {
-      T3 => "," ;
-      _ => []
+      T3 => BIND++","++BIND ;
+      _  => BIND
       } ;
 
     inc : DTail -> DTail = \t -> case t of {
diff --git a/lib/src/polish/NumeralPol.gf b/lib/src/polish/NumeralPol.gf
index 5dd437ec8..c2a5bf000 100644
--- a/lib/src/polish/NumeralPol.gf
+++ b/lib/src/polish/NumeralPol.gf
@@ -537,7 +537,7 @@ oper tysiac = table {
     IDig d = d;
     
 --     IIDig : Dig -> Digits -> Digits ; -- 876
-    IIDig d dd = { s = d.s ++ dd.s; o = d.s ++ dd.o; n=Pl; a=dd.a };
+    IIDig d dd = { s = d.s ++ BIND ++ dd.s; o = d.s ++ BIND ++ dd.o; n=Pl; a=dd.a };
 
     D_0 = { s = "0"; o="0."; n=Pl; a=TysiacA };
     D_1 = { s = "1"; o="1."; n=Sg; a=NoA };
diff --git a/lib/src/romanian/NumeralRon.gf b/lib/src/romanian/NumeralRon.gf
index e99d38d3b..f4299ae83 100644
--- a/lib/src/romanian/NumeralRon.gf
+++ b/lib/src/romanian/NumeralRon.gf
@@ -223,7 +223,7 @@ lin
    IDig d = d ;
 
    IIDig d i = {
-     s = \\o => d.s ! NCard Masc ++ i.s ! o ;
+     s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
       n = case d.n of
               { sg => if_then_else Size (i.isDig) less20 pl ;
                 _  => pl           
diff --git a/lib/src/russian/NumeralRus.gf b/lib/src/russian/NumeralRus.gf
index b5c45c3b0..3e1effc07 100644
--- a/lib/src/russian/NumeralRus.gf
+++ b/lib/src/russian/NumeralRus.gf
@@ -1,6 +1,6 @@
 --# -path=.:../abstract:../common:../../prelude
 
-concrete NumeralRus of Numeral = CatRus ** open ResRus in {
+concrete NumeralRus of Numeral = CatRus ** open ResRus, Prelude in {
 
 flags  coding=utf8 ;
 
@@ -234,7 +234,7 @@ lin pot3plus n m =
     IDig d = {s = d.s ; n = d.n ; size = d.size} ;
 
     IIDig d i = {
-      s = d.s ++ i.s ;
+      s = d.s ++ BIND ++ i.s ;
       n = Pl ;
       size = i.size
     } ;
diff --git a/lib/src/spanish/NumeralSpa.gf b/lib/src/spanish/NumeralSpa.gf
index 333860c48..c04bfe044 100644
--- a/lib/src/spanish/NumeralSpa.gf
+++ b/lib/src/spanish/NumeralSpa.gf
@@ -111,7 +111,7 @@ param
     IDig d = d ;
 
     IIDig d i = {
-      s = \\o => d.s ! NCard Masc ++ i.s ! o ;
+      s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
       n = Pl
     } ;
 
diff --git a/lib/src/telugu/NumeralTel.gf b/lib/src/telugu/NumeralTel.gf
index b6bd81379..cc243cc77 100644
--- a/lib/src/telugu/NumeralTel.gf
+++ b/lib/src/telugu/NumeralTel.gf
@@ -69,8 +69,8 @@
 ----
 ----  oper
 ----    commaIf : DTail -> Str = \t -> case t of {
-----      T3 => "," ;
-----      _ => []
+----      T3 => BIND++","++BIND ;
+----      _  => BIND
 ----      } ;
 ----
 ----    inc : DTail -> DTail = \t -> case t of {
diff --git a/lib/src/turkish/NumeralTur.gf b/lib/src/turkish/NumeralTur.gf
index e41d43f46..a09a7aa99 100644
--- a/lib/src/turkish/NumeralTur.gf
+++ b/lib/src/turkish/NumeralTur.gf
@@ -67,8 +67,8 @@ lin
   D_9 = mkDig "9" ;
 oper
   commaIf : DTail -> Str = \t -> case t of {
-				   T3 => "," ;
-				   _ => []
+				   T3 => BIND++","++BIND ;
+				   _  => BIND
 	                         } ;
 
   inc : DTail -> DTail = \t -> case t of {