diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
index 65a118fc..58010ff9 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/types.mps
@@ -226,10 +226,6 @@
-
-
-
-
@@ -254,6 +250,10 @@
+
+
+
+
@@ -1094,6 +1094,7 @@
+
@@ -1310,18 +1311,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -2097,18 +2091,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
index 7f60efcb..b05d4fde 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/models/types.mps
@@ -315,10 +315,6 @@
-
-
-
-
@@ -343,6 +339,10 @@
+
+
+
+
@@ -1259,6 +1259,7 @@
+
@@ -1394,18 +1395,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -1949,6 +1943,7 @@
+
@@ -2112,18 +2107,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -2747,18 +2735,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/samples/fitch/languages/samples.fitch/models/types.mps b/samples/fitch/languages/samples.fitch/models/types.mps
index d5709595..b5017284 100644
--- a/samples/fitch/languages/samples.fitch/models/types.mps
+++ b/samples/fitch/languages/samples.fitch/models/types.mps
@@ -88,10 +88,6 @@
-
-
-
-
@@ -100,6 +96,10 @@
+
+
+
+
@@ -317,18 +317,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -440,18 +433,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 6822d8d4..6d1f9fd8 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -421,10 +421,6 @@
-
-
-
-
@@ -460,6 +456,10 @@
+
+
+
+
@@ -3608,33 +3608,26 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -3814,18 +3807,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index b10e5402..0e8f8ee7 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -687,6 +687,10 @@
+
+
+
+
@@ -5539,18 +5543,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -6023,18 +6020,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -19659,18 +19649,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -19721,18 +19704,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -19783,18 +19759,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -19845,18 +19814,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+