diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 44ae28dd..ce8df3f7 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -406,6 +406,8 @@
       <concept id="4057204182462594788" name="jetbrains.mps.lang.coderules.structure.IVisible" flags="ng" index="4DQHh">
         <child id="4057204182462594789" name="visibility" index="4DQHg" />
       </concept>
+      <concept id="4057204182462608181" name="jetbrains.mps.lang.coderules.structure.PrivateVisibility" flags="ng" index="4DUq0" />
+      <concept id="4057204182462608180" name="jetbrains.mps.lang.coderules.structure.ProtectedVisibility" flags="ng" index="4DUq1" />
       <concept id="4057204182462608179" name="jetbrains.mps.lang.coderules.structure.PublicVisibility" flags="ng" index="4DUq6" />
       <concept id="7871500063866331595" name="jetbrains.mps.lang.coderules.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
@@ -1573,7 +1575,7 @@
       <node concept="1zAUYm" id="48ZGLP7phpp" role="1zAUyy">
         <property role="TrG5h" value="introducedTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPl" role="4DQHg" />
+      <node concept="4DUq1" id="4Nh5OH7UzW8" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="1IKbs5XDAuv" role="1nK1Vg">
       <property role="TrG5h" value="test_rules" />
@@ -4443,7 +4445,7 @@
       <node concept="1zAUYm" id="4dPZ2m2i60F" role="1zAUyy">
         <property role="TrG5h" value="type" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPq" role="4DQHg" />
+      <node concept="4DUq1" id="4Nh5OH7UCbP" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7rIE2" role="8PkJo">
       <property role="TrG5h" value="recoverTypeVars" />
@@ -4459,17 +4461,7 @@
       <node concept="1zAUYm" id="48ZGLP7rIKo" role="1zAUyy">
         <property role="TrG5h" value="typeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPr" role="4DQHg" />
-    </node>
-    <node concept="3AqmO8" id="47tET_WiT7i" role="8PkJo">
-      <property role="TrG5h" value="toRecoverConstraints" />
-      <node concept="1zAUYm" id="47tET_WiT9_" role="1zAUyy">
-        <property role="TrG5h" value="typeVar" />
-      </node>
-      <node concept="1zAUYm" id="47tET_WiT9B" role="1zAUyy">
-        <property role="TrG5h" value="constraintsSet" />
-      </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPs" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UC6J" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WheG$" role="8PkJo">
       <property role="TrG5h" value="recoverConstraints" />
@@ -4479,7 +4471,7 @@
       <node concept="1zAUYm" id="47tET_WheIH" role="1zAUyy">
         <property role="TrG5h" value="typeVar" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPt" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UC6M" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Whfh$" role="8PkJo">
       <property role="TrG5h" value="recoverConstraintList" />
@@ -4492,7 +4484,17 @@
       <node concept="1zAUYm" id="47tET_WhhV6" role="1zAUyy">
         <property role="TrG5h" value="consList" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPu" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UC6P" role="4DQHg" />
+    </node>
+    <node concept="3AqmO8" id="47tET_WiT7i" role="8PkJo">
+      <property role="TrG5h" value="toRecoverConstraints" />
+      <node concept="1zAUYm" id="47tET_WiT9_" role="1zAUyy">
+        <property role="TrG5h" value="typeVar" />
+      </node>
+      <node concept="1zAUYm" id="47tET_WiT9B" role="1zAUyy">
+        <property role="TrG5h" value="constraintsSet" />
+      </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPs" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="47tET_WlKbY" role="1nK1Vg">
       <property role="TrG5h" value="reproduceTypeConstraints_start" />
@@ -6382,6 +6384,19 @@
   <node concept="AVZre" id="12dHl3ZCEwp">
     <property role="TrG5h" value="forall" />
     <ref role="2YbDB9" node="47tET_W6GBd" resolve="typeConstraints" />
+    <node concept="3AqmO8" id="12dHl3ZCEx3" role="8PkJo">
+      <property role="TrG5h" value="inst" />
+      <node concept="1zAUYm" id="12dHl3ZCEx4" role="1zAUyy">
+        <property role="TrG5h" value="type" />
+      </node>
+      <node concept="1zAUYm" id="12dHl3ZCEx5" role="1zAUyy">
+        <property role="TrG5h" value="forall" />
+      </node>
+      <node concept="1zAUYm" id="48ZGLP7zRGc" role="1zAUyy">
+        <property role="TrG5h" value="typeVars" />
+      </node>
+      <node concept="4DUq6" id="1Z2HYz9jjPx" role="4DQHg" />
+    </node>
     <node concept="3AqmO8" id="48ZGLP7O6fU" role="8PkJo">
       <property role="TrG5h" value="gen" />
       <node concept="1zAUYm" id="48ZGLP7O6gm" role="1zAUyy">
@@ -6406,20 +6421,7 @@
       <node concept="1zAUYm" id="48ZGLP7pkx5" role="1zAUyy">
         <property role="TrG5h" value="freeTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPw" role="4DQHg" />
-    </node>
-    <node concept="3AqmO8" id="12dHl3ZCEx3" role="8PkJo">
-      <property role="TrG5h" value="inst" />
-      <node concept="1zAUYm" id="12dHl3ZCEx4" role="1zAUyy">
-        <property role="TrG5h" value="type" />
-      </node>
-      <node concept="1zAUYm" id="12dHl3ZCEx5" role="1zAUyy">
-        <property role="TrG5h" value="forall" />
-      </node>
-      <node concept="1zAUYm" id="48ZGLP7zRGc" role="1zAUyy">
-        <property role="TrG5h" value="typeVars" />
-      </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPx" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Uuu4" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7pk5w" role="8PkJo">
       <property role="TrG5h" value="genTypeVars" />
@@ -6429,7 +6431,7 @@
       <node concept="1zAUYm" id="48ZGLP7plaN" role="1zAUyy">
         <property role="TrG5h" value="freeTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPy" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Uuu7" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP7pAI2" role="8PkJo">
       <property role="TrG5h" value="instTypeVars" />
@@ -6445,7 +6447,7 @@
       <node concept="1zAUYm" id="48ZGLP7zRHp" role="1zAUyy">
         <property role="TrG5h" value="resultTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPz" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Uuua" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="48ZGLP7ppHO" role="1nK1Vg">
       <property role="TrG5h" value="genTypeVars_baseCase" />
@@ -7755,7 +7757,7 @@
     </node>
     <node concept="3AqmO8" id="48ZGLP8SeQb" role="8PkJo">
       <property role="TrG5h" value="subsumedFail" />
-      <node concept="4DUq6" id="1Z2HYz9jjP_" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UOK2" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="48ZGLP92BQW" role="8PkJo">
       <property role="TrG5h" value="renameTypeVars" />
@@ -7765,17 +7767,7 @@
       <node concept="1zAUYm" id="48ZGLP92BR7" role="1zAUyy">
         <property role="TrG5h" value="originalTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPA" role="4DQHg" />
-    </node>
-    <node concept="3AqmO8" id="1IKbs5Xw9SC" role="8PkJo">
-      <property role="TrG5h" value="tryRenameTypeVars" />
-      <node concept="1zAUYm" id="1IKbs5Xw9SD" role="1zAUyy">
-        <property role="TrG5h" value="toRename" />
-      </node>
-      <node concept="1zAUYm" id="1IKbs5Xw9SE" role="1zAUyy">
-        <property role="TrG5h" value="originalTypeVars" />
-      </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPB" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UOK5" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="1IKbs5XihHK" role="8PkJo">
       <property role="TrG5h" value="checkTypeVars" />
@@ -7785,7 +7777,21 @@
       <node concept="1zAUYm" id="1IKbs5XihHW" role="1zAUyy">
         <property role="TrG5h" value="originalTypeVars" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPC" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UOKb" role="4DQHg" />
+    </node>
+    <node concept="1X3_iC" id="4Nh5OH7UOKP" role="lGtFl">
+      <property role="3V$3am" value="constraint" />
+      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/1980609059185345194" />
+      <node concept="3AqmO8" id="1IKbs5Xw9SC" role="8Wnug">
+        <property role="TrG5h" value="tryRenameTypeVars" />
+        <node concept="1zAUYm" id="1IKbs5Xw9SD" role="1zAUyy">
+          <property role="TrG5h" value="toRename" />
+        </node>
+        <node concept="1zAUYm" id="1IKbs5Xw9SE" role="1zAUyy">
+          <property role="TrG5h" value="originalTypeVars" />
+        </node>
+        <node concept="4DUq0" id="4Nh5OH7UOK8" role="4DQHg" />
+      </node>
     </node>
     <node concept="1nLNMY" id="2O9ahh6MeO6" role="1nK1Vg">
       <property role="TrG5h" value="renameTypeVars_check" />
@@ -11611,7 +11617,7 @@
       <node concept="1zAUYm" id="47tET_WsDRA" role="1zAUyy">
         <property role="TrG5h" value="result" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPI" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7UKyJ" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_W4NQw" role="8PkJo">
       <property role="TrG5h" value="setToCons" />
@@ -11664,11 +11670,7 @@
       <node concept="1zAUYm" id="47xL5G3eTpY" role="1zAUyy">
         <property role="TrG5h" value="typeVarDef" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPN" role="4DQHg" />
-    </node>
-    <node concept="3AqmO8" id="47tET_WlK9C" role="8PkJo">
-      <property role="TrG5h" value="reproduceTypeConstraints" />
-      <node concept="4DUq6" id="1Z2HYz9jjPO" role="4DQHg" />
+      <node concept="4DUq1" id="4Nh5OH7Un8Y" role="4DQHg" />
     </node>
     <node concept="1nLNMY" id="47tET_W4RYO" role="1nK1Vg">
       <property role="TrG5h" value="typeConstraints_mergeSets" />
@@ -12150,7 +12152,7 @@
       <node concept="1zAUYm" id="47tET_Wgb9Z" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintsSet" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPP" role="4DQHg" />
+      <node concept="4DUq1" id="4Nh5OH7Un91" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Wh9Mr" role="8PkJo">
       <property role="TrG5h" value="strengthCheck" />
@@ -12160,7 +12162,7 @@
       <node concept="1zAUYm" id="47tET_Wh9MJ" role="1zAUyy">
         <property role="TrG5h" value="strongerSet" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPQ" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Ua1p" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_Wh6jP" role="8PkJo">
       <property role="TrG5h" value="instanceCheck" />
@@ -12170,7 +12172,7 @@
       <node concept="1zAUYm" id="47tET_Wh6k6" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintSet" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPR" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Ua1s" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsEug" role="8PkJo">
       <property role="TrG5h" value="instanceCheckHelper" />
@@ -12180,7 +12182,7 @@
       <node concept="1zAUYm" id="47tET_WsEuC" role="1zAUyy">
         <property role="TrG5h" value="typeConstraintList" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPS" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Ua1v" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsED9" role="8PkJo">
       <property role="TrG5h" value="checkSingleInstance" />
@@ -12190,7 +12192,7 @@
       <node concept="1zAUYm" id="47tET_WsEDB" role="1zAUyy">
         <property role="TrG5h" value="typeConstraint" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPT" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Ua1y" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WFhSG" role="8PkJo">
       <property role="TrG5h" value="discardIfInstanceFound" />
@@ -12200,7 +12202,7 @@
       <node concept="1zAUYm" id="47tET_WFhTb" role="1zAUyy">
         <property role="TrG5h" value="instantiatedTypeScheme" />
       </node>
-      <node concept="4DUq6" id="1Z2HYz9jjPU" role="4DQHg" />
+      <node concept="4DUq0" id="4Nh5OH7Ua1_" role="4DQHg" />
     </node>
     <node concept="3AqmO8" id="47tET_WsEA7" role="8PkJo">
       <property role="TrG5h" value="instance" />
@@ -12212,6 +12214,10 @@
       </node>
       <node concept="4DUq6" id="1Z2HYz9jjPV" role="4DQHg" />
     </node>
+    <node concept="3AqmO8" id="47tET_WlK9C" role="8PkJo">
+      <property role="TrG5h" value="reproduceTypeConstraints" />
+      <node concept="4DUq6" id="1Z2HYz9jjPO" role="4DQHg" />
+    </node>
     <node concept="1nLNMY" id="47xL5G3rv_f" role="1nK1Vg">
       <property role="TrG5h" value="checkVarConstraints" />
       <node concept="3clFbS" id="47xL5G3rv_g" role="1nLNMH">