diff --git a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps b/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
index 7e96e866..26ea2cb5 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/editor.mps
@@ -86,6 +86,9 @@
         <child id="8612453216082699922" name="substituteHandler" index="3aKz83" />
       </concept>
       <concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
+      <concept id="1236262245656" name="jetbrains.mps.lang.editor.structure.MatchingLabelStyleClassItem" flags="ln" index="3mYdg7">
+        <property id="1238091709220" name="labelName" index="1413C4" />
+      </concept>
       <concept id="3308396621974580100" name="jetbrains.mps.lang.editor.structure.SubstituteMenu_Default" flags="ng" index="3p36aQ" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
         <property id="1139852716018" name="noTargetText" index="1$x2rV" />
@@ -130,27 +133,17 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
-      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
-      </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
@@ -174,19 +167,9 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
-      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
-        <property id="1068580123138" name="value" index="3clFbU" />
-      </concept>
-      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
-        <property id="1068580320021" name="value" index="3cmrfH" />
-      </concept>
-      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
-        <child id="1068581517676" name="expression" index="3cqZAk" />
-      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -195,9 +178,6 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
-        <reference id="1107535924139" name="classifier" index="3uigEE" />
-      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -216,9 +196,6 @@
       <concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
         <child id="1140725362529" name="linkTarget" index="2oxUTC" />
       </concept>
-      <concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
-        <child id="1138662048170" name="value" index="tz02z" />
-      </concept>
       <concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
         <reference id="1139880128956" name="concept" index="1A9B2P" />
       </concept>
@@ -279,9 +256,6 @@
     <property role="3GE5qa" value="clause" />
     <ref role="1XX52x" to="8tt8:7_8aRkgDHAe" resolve="LetClause" />
     <node concept="3EZMnI" id="7_8aRkgDHAm" role="2wV5jI">
-      <node concept="3F0ifn" id="7_8aRkgHafS" role="3EZMnx">
-        <property role="3F0ifm" value="&gt;" />
-      </node>
       <node concept="PMmxH" id="7_8aRkgDHAw" role="3EZMnx">
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
       </node>
@@ -307,38 +281,15 @@
       <node concept="l2Vlx" id="7_8aRkgDHB2" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="7_8aRkgDHBf">
-    <property role="3GE5qa" value="expr.const" />
-    <ref role="1XX52x" to="8tt8:7_8aRkgDHBc" resolve="StringConst" />
-    <node concept="3EZMnI" id="7_8aRkgDHBh" role="2wV5jI">
-      <node concept="3F0ifn" id="7_8aRkgDHBo" role="3EZMnx">
-        <property role="3F0ifm" value="'" />
-      </node>
-      <node concept="3F0A7n" id="7_8aRkgDHBF" role="3EZMnx">
-        <ref role="1NtTu8" to="8tt8:7_8aRkgDHBd" resolve="value" />
-      </node>
-      <node concept="3F0ifn" id="7_8aRkgDHBu" role="3EZMnx">
-        <property role="3F0ifm" value="'" />
-      </node>
-      <node concept="l2Vlx" id="7_8aRkgDHBk" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="7_8aRkgDHCe">
-    <property role="3GE5qa" value="expr.const" />
-    <ref role="1XX52x" to="8tt8:7_8aRkgDHBK" resolve="NumConst" />
-    <node concept="3EZMnI" id="7_8aRkgDHCg" role="2wV5jI">
-      <node concept="3F0A7n" id="7_8aRkgDHCn" role="3EZMnx">
-        <ref role="1NtTu8" to="8tt8:7_8aRkgDHBL" resolve="value" />
-      </node>
-      <node concept="l2Vlx" id="7_8aRkgDHCj" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="7_8aRkgE07J">
     <property role="3GE5qa" value="expr.fun" />
     <ref role="1XX52x" to="8tt8:7_8aRkgDGQf" resolve="Abs" />
     <node concept="3EZMnI" id="7_8aRkgE07L" role="2wV5jI">
       <node concept="3F0ifn" id="7_8aRkgE07S" role="3EZMnx">
         <property role="3F0ifm" value="(" />
+        <node concept="3mYdg7" id="492bFERnOR6" role="3F10Kt">
+          <property role="1413C4" value="abs" />
+        </node>
       </node>
       <node concept="3F1sOY" id="7_8aRkgF1Cc" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:7_8aRkgDGQg" resolve="bind" />
@@ -351,6 +302,9 @@
       </node>
       <node concept="3F0ifn" id="7_8aRkgE07Y" role="3EZMnx">
         <property role="3F0ifm" value=")" />
+        <node concept="3mYdg7" id="492bFERnOVm" role="3F10Kt">
+          <property role="1413C4" value="abs" />
+        </node>
       </node>
       <node concept="l2Vlx" id="7_8aRkgE07O" role="2iSdaV" />
     </node>
@@ -359,6 +313,9 @@
     <property role="3GE5qa" value="expr.fun" />
     <ref role="1XX52x" to="8tt8:7_8aRkgDGQi" resolve="BindVar" />
     <node concept="3EZMnI" id="7_8aRkgE08q" role="2wV5jI">
+      <node concept="3F0ifn" id="492bFERnr4S" role="3EZMnx">
+        <property role="3F0ifm" value="\" />
+      </node>
       <node concept="3F1sOY" id="7_8aRkgE08x" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:7_8aRkgDGQj" resolve="var" />
       </node>
@@ -371,17 +328,20 @@
     <node concept="3EZMnI" id="7_8aRkgE08T" role="2wV5jI">
       <node concept="3F0ifn" id="7_8aRkgE2tK" role="3EZMnx">
         <property role="3F0ifm" value="(" />
-        <node concept="pkWqt" id="7_8aRkgE2u0" role="pqm2j">
-          <node concept="3clFbS" id="7_8aRkgE2u1" role="2VODD2">
-            <node concept="3clFbF" id="7_8aRkgETAn" role="3cqZAp">
-              <node concept="3clFbC" id="7_8aRkgEUsG" role="3clFbG">
-                <node concept="2OqwBi" id="7_8aRkgEVfA" role="3uHU7w">
-                  <node concept="pncrf" id="7_8aRkgEUTo" role="2Oq$k0" />
-                  <node concept="25OxAV" id="7_8aRkgEW19" role="2OqNvi" />
-                </node>
-                <node concept="28GBK8" id="7_8aRkgETAl" role="3uHU7B">
+        <node concept="3mYdg7" id="492bFERnM4N" role="3F10Kt">
+          <property role="1413C4" value="app" />
+        </node>
+        <node concept="pkWqt" id="492bFERnRAy" role="pqm2j">
+          <node concept="3clFbS" id="492bFERnRAz" role="2VODD2">
+            <node concept="3clFbF" id="492bFERnRHH" role="3cqZAp">
+              <node concept="3clFbC" id="492bFERnTf9" role="3clFbG">
+                <node concept="28GBK8" id="492bFERnTu8" role="3uHU7w">
                   <ref role="28GBKb" to="8tt8:7_8aRkgDGPK" resolve="App" />
-                  <ref role="28H3Ia" to="8tt8:7_8aRkgDGPL" resolve="fun" />
+                  <ref role="28H3Ia" to="8tt8:7_8aRkgDGPX" resolve="arg" />
+                </node>
+                <node concept="2OqwBi" id="492bFERnRUE" role="3uHU7B">
+                  <node concept="pncrf" id="492bFERnRHG" role="2Oq$k0" />
+                  <node concept="25OxAV" id="492bFERnSu6" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -399,17 +359,20 @@
       </node>
       <node concept="3F0ifn" id="7_8aRkgE2tU" role="3EZMnx">
         <property role="3F0ifm" value=")" />
-        <node concept="pkWqt" id="7_8aRkgEXAl" role="pqm2j">
-          <node concept="3clFbS" id="7_8aRkgEXAm" role="2VODD2">
-            <node concept="3clFbF" id="7_8aRkgEXAs" role="3cqZAp">
-              <node concept="3clFbC" id="7_8aRkgEXAt" role="3clFbG">
-                <node concept="2OqwBi" id="7_8aRkgEXAu" role="3uHU7w">
-                  <node concept="pncrf" id="7_8aRkgEXAv" role="2Oq$k0" />
-                  <node concept="25OxAV" id="7_8aRkgEXAw" role="2OqNvi" />
-                </node>
-                <node concept="28GBK8" id="7_8aRkgEXAx" role="3uHU7B">
+        <node concept="3mYdg7" id="492bFERnM93" role="3F10Kt">
+          <property role="1413C4" value="app" />
+        </node>
+        <node concept="pkWqt" id="492bFERo0eS" role="pqm2j">
+          <node concept="3clFbS" id="492bFERo0eT" role="2VODD2">
+            <node concept="3clFbF" id="492bFERo0m2" role="3cqZAp">
+              <node concept="3clFbC" id="492bFERo0m3" role="3clFbG">
+                <node concept="28GBK8" id="492bFERo0m4" role="3uHU7w">
                   <ref role="28GBKb" to="8tt8:7_8aRkgDGPK" resolve="App" />
-                  <ref role="28H3Ia" to="8tt8:7_8aRkgDGPL" resolve="fun" />
+                  <ref role="28H3Ia" to="8tt8:7_8aRkgDGPX" resolve="arg" />
+                </node>
+                <node concept="2OqwBi" id="492bFERo0m5" role="3uHU7B">
+                  <node concept="pncrf" id="492bFERo0m6" role="2Oq$k0" />
+                  <node concept="25OxAV" id="492bFERo0m7" role="2OqNvi" />
                 </node>
               </node>
             </node>
@@ -423,9 +386,6 @@
     <property role="3GE5qa" value="clause" />
     <ref role="1XX52x" to="8tt8:7_8aRkgEZ_W" resolve="ExprClause" />
     <node concept="3EZMnI" id="7_8aRkgEZA1" role="2wV5jI">
-      <node concept="3F0ifn" id="7_8aRkgH6Ew" role="3EZMnx">
-        <property role="3F0ifm" value="&gt;" />
-      </node>
       <node concept="3F1sOY" id="7_8aRkgEZA8" role="3EZMnx">
         <ref role="1NtTu8" to="8tt8:7_8aRkgEZ_X" resolve="expr" />
       </node>
@@ -437,80 +397,6 @@
     <ref role="aqKnT" to="8tt8:7_8aRkgDGPJ" resolve="Expr" />
     <node concept="2VfDsV" id="7_8aRkgF5zg" role="3ft7WO" />
   </node>
-  <node concept="3p36aQ" id="7_8aRkgF5zH">
-    <property role="3GE5qa" value="expr.const" />
-    <ref role="aqKnT" to="8tt8:7_8aRkgDHBc" resolve="StringConst" />
-    <node concept="3eGOop" id="7_8aRkgF72g" role="3ft7WO">
-      <node concept="ucgPf" id="7_8aRkgF72h" role="3aKz83">
-        <node concept="3clFbS" id="7_8aRkgF72i" role="2VODD2">
-          <node concept="3cpWs8" id="7_8aRkgFd8M" role="3cqZAp">
-            <node concept="3cpWsn" id="7_8aRkgFd8N" role="3cpWs9">
-              <property role="TrG5h" value="str" />
-              <node concept="3Tqbb2" id="7_8aRkgFd8K" role="1tU5fm">
-                <ref role="ehGHo" to="8tt8:7_8aRkgDHBc" resolve="StringConst" />
-              </node>
-              <node concept="2ShNRf" id="7_8aRkgFd8O" role="33vP2m">
-                <node concept="3zrR0B" id="7_8aRkgFd8P" role="2ShVmc">
-                  <node concept="3Tqbb2" id="7_8aRkgFd8Q" role="3zrR0E">
-                    <ref role="ehGHo" to="8tt8:7_8aRkgDHBc" resolve="StringConst" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7_8aRkgF9_V" role="3cqZAp">
-            <node concept="2OqwBi" id="7_8aRkgFepi" role="3clFbG">
-              <node concept="2OqwBi" id="7_8aRkgFdly" role="2Oq$k0">
-                <node concept="37vLTw" id="7_8aRkgFd8R" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7_8aRkgFd8N" resolve="str" />
-                </node>
-                <node concept="3TrcHB" id="7_8aRkgFdMb" role="2OqNvi">
-                  <ref role="3TsBF5" to="8tt8:7_8aRkgDHBd" resolve="value" />
-                </node>
-              </node>
-              <node concept="tyxLq" id="7_8aRkgFePf" role="2OqNvi">
-                <node concept="2OqwBi" id="7_8aRkgFg14" role="tz02z">
-                  <node concept="ub8z3" id="7_8aRkgFfGB" role="2Oq$k0" />
-                  <node concept="liA8E" id="7_8aRkgFgP3" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
-                    <node concept="3cmrfG" id="7_8aRkgFgY0" role="37wK5m">
-                      <property role="3cmrfH" value="1" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7_8aRkgFh8n" role="3cqZAp">
-            <node concept="37vLTw" id="7_8aRkgFh8l" role="3clFbG">
-              <ref role="3cqZAo" node="7_8aRkgFd8N" resolve="str" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NL3D" id="7_8aRkgF76n" role="upBLP">
-        <node concept="16Na2f" id="7_8aRkgF76o" role="16NL3A">
-          <node concept="3clFbS" id="7_8aRkgF76p" role="2VODD2">
-            <node concept="3clFbF" id="7_8aRkgF7pY" role="3cqZAp">
-              <node concept="2OqwBi" id="7_8aRkgF89k" role="3clFbG">
-                <node concept="2YIFZM" id="7_8aRkgF7xm" role="2Oq$k0">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                  <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <node concept="ub8z3" id="7_8aRkgF7GJ" role="37wK5m" />
-                </node>
-                <node concept="liA8E" id="7_8aRkgF9h1" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String):boolean" resolve="startsWith" />
-                  <node concept="Xl_RD" id="7_8aRkgF9h7" role="37wK5m">
-                    <property role="Xl_RC" value="'" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="IW6AY" id="7_8aRkgF6Dj">
     <property role="3GE5qa" value="expr" />
     <ref role="aqKnT" to="8tt8:7_8aRkgDGPJ" resolve="Expr" />
@@ -630,95 +516,6 @@
       </node>
     </node>
   </node>
-  <node concept="3p36aQ" id="7_8aRkgFjlo">
-    <property role="3GE5qa" value="expr.const" />
-    <ref role="aqKnT" to="8tt8:7_8aRkgDHBK" resolve="NumConst" />
-    <node concept="3eGOop" id="7_8aRkgFjlr" role="3ft7WO">
-      <node concept="ucgPf" id="7_8aRkgFjlt" role="3aKz83">
-        <node concept="3clFbS" id="7_8aRkgFjlv" role="2VODD2">
-          <node concept="3cpWs8" id="7_8aRkgFmNC" role="3cqZAp">
-            <node concept="3cpWsn" id="7_8aRkgFmND" role="3cpWs9">
-              <property role="TrG5h" value="num" />
-              <node concept="3Tqbb2" id="7_8aRkgFmNA" role="1tU5fm">
-                <ref role="ehGHo" to="8tt8:7_8aRkgDHBK" resolve="NumConst" />
-              </node>
-              <node concept="2ShNRf" id="7_8aRkgFmNE" role="33vP2m">
-                <node concept="3zrR0B" id="7_8aRkgFmNF" role="2ShVmc">
-                  <node concept="3Tqbb2" id="7_8aRkgFmNG" role="3zrR0E">
-                    <ref role="ehGHo" to="8tt8:7_8aRkgDHBK" resolve="NumConst" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7_8aRkgFmtC" role="3cqZAp">
-            <node concept="37vLTI" id="7_8aRkgFpbs" role="3clFbG">
-              <node concept="2YIFZM" id="7_8aRkgFpLG" role="37vLTx">
-                <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String):int" resolve="parseInt" />
-                <node concept="ub8z3" id="7_8aRkgFqqH" role="37wK5m" />
-              </node>
-              <node concept="2OqwBi" id="7_8aRkgFncQ" role="37vLTJ">
-                <node concept="37vLTw" id="7_8aRkgFmNH" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7_8aRkgFmND" resolve="num" />
-                </node>
-                <node concept="3TrcHB" id="7_8aRkgFnt4" role="2OqNvi">
-                  <ref role="3TsBF5" to="8tt8:7_8aRkgDHBL" resolve="value" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="7_8aRkgFsSg" role="3cqZAp">
-            <node concept="37vLTw" id="7_8aRkgFsSe" role="3clFbG">
-              <ref role="3cqZAo" node="7_8aRkgFmND" resolve="num" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16NL3D" id="7_8aRkgFjp_" role="upBLP">
-        <node concept="16Na2f" id="7_8aRkgFjpA" role="16NL3A">
-          <node concept="3clFbS" id="7_8aRkgFjpB" role="2VODD2">
-            <node concept="SfApY" id="7_8aRkgFj$L" role="3cqZAp">
-              <node concept="3clFbS" id="7_8aRkgFj$M" role="SfCbr">
-                <node concept="3clFbF" id="7_8aRkgFjXb" role="3cqZAp">
-                  <node concept="2YIFZM" id="7_8aRkgFk72" role="3clFbG">
-                    <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String):int" resolve="parseInt" />
-                    <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                    <node concept="2YIFZM" id="7_8aRkgFkHD" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
-                      <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <node concept="ub8z3" id="7_8aRkgFkQk" role="37wK5m" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs6" id="7_8aRkgFlkn" role="3cqZAp">
-                  <node concept="3clFbT" id="7_8aRkgFlu4" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
-                  </node>
-                </node>
-                <node concept="3clFbH" id="7_8aRkgFmjH" role="3cqZAp" />
-              </node>
-              <node concept="TDmWw" id="7_8aRkgFj$N" role="TEbGg">
-                <node concept="3cpWsn" id="7_8aRkgFj$O" role="TDEfY">
-                  <property role="TrG5h" value="ignore" />
-                  <node concept="3uibUv" id="7_8aRkgFlBH" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="7_8aRkgFj$Q" role="TDEfX">
-                  <node concept="3cpWs6" id="7_8aRkgFm0a" role="3cqZAp">
-                    <node concept="3clFbT" id="7_8aRkgFm9U" role="3cqZAk">
-                      <property role="3clFbU" value="false" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="24kQdi" id="7_8aRkgFwkP">
     <property role="3GE5qa" value="expr.let" />
     <ref role="1XX52x" to="8tt8:7_8aRkgDGQo" resolve="LetExpr" />
@@ -962,26 +759,6 @@
     <property role="3GE5qa" value="expr.fun" />
     <ref role="aqKnT" to="8tt8:7_8aRkgDGPK" resolve="App" />
   </node>
-  <node concept="24kQdi" id="3_qfG1EP6NQ">
-    <property role="3GE5qa" value="type" />
-    <ref role="1XX52x" to="8tt8:3_qfG1EP6NP" resolve="StrType" />
-    <node concept="3EZMnI" id="3_qfG1EP6NS" role="2wV5jI">
-      <node concept="3F0ifn" id="3_qfG1EP6NZ" role="3EZMnx">
-        <property role="3F0ifm" value="Str" />
-      </node>
-      <node concept="l2Vlx" id="3_qfG1EP6NV" role="2iSdaV" />
-    </node>
-  </node>
-  <node concept="24kQdi" id="3_qfG1EP6O3">
-    <property role="3GE5qa" value="type" />
-    <ref role="1XX52x" to="8tt8:3_qfG1EP6O2" resolve="NumType" />
-    <node concept="3EZMnI" id="3_qfG1EP6O5" role="2wV5jI">
-      <node concept="3F0ifn" id="3_qfG1EP6Oc" role="3EZMnx">
-        <property role="3F0ifm" value="Num" />
-      </node>
-      <node concept="l2Vlx" id="3_qfG1EP6O8" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="3_qfG1EP6Og">
     <property role="3GE5qa" value="type" />
     <ref role="1XX52x" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
@@ -991,31 +768,22 @@
         <node concept="pkWqt" id="4rRw8_AvxCL" role="pqm2j">
           <node concept="3clFbS" id="4rRw8_AvxCM" role="2VODD2">
             <node concept="3clFbF" id="4rRw8_Avyxn" role="3cqZAp">
-              <node concept="22lmx$" id="4rRw8_AvzoJ" role="3clFbG">
-                <node concept="3clFbC" id="4rRw8_Avyxo" role="3uHU7B">
-                  <node concept="28GBK8" id="4rRw8_Avyxs" role="3uHU7B">
-                    <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
-                    <ref role="28H3Ia" to="8tt8:3_qfG1EP6Op" resolve="argType" />
-                  </node>
-                  <node concept="2OqwBi" id="4rRw8_Avyxp" role="3uHU7w">
-                    <node concept="pncrf" id="4rRw8_Avyxq" role="2Oq$k0" />
-                    <node concept="25OxAV" id="4rRw8_Avyxr" role="2OqNvi" />
-                  </node>
+              <node concept="3clFbC" id="4rRw8_Avyxo" role="3clFbG">
+                <node concept="28GBK8" id="4rRw8_Avyxs" role="3uHU7B">
+                  <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
+                  <ref role="28H3Ia" to="8tt8:3_qfG1EP6Op" resolve="argType" />
                 </node>
-                <node concept="3clFbC" id="4rRw8_AvzwM" role="3uHU7w">
-                  <node concept="28GBK8" id="4rRw8_AvzwN" role="3uHU7B">
-                    <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
-                    <ref role="28H3Ia" to="8tt8:3_qfG1EP6O_" resolve="resType" />
-                  </node>
-                  <node concept="2OqwBi" id="4rRw8_AvzwO" role="3uHU7w">
-                    <node concept="pncrf" id="4rRw8_AvzwP" role="2Oq$k0" />
-                    <node concept="25OxAV" id="4rRw8_AvzwQ" role="2OqNvi" />
-                  </node>
+                <node concept="2OqwBi" id="4rRw8_Avyxp" role="3uHU7w">
+                  <node concept="pncrf" id="4rRw8_Avyxq" role="2Oq$k0" />
+                  <node concept="25OxAV" id="4rRw8_Avyxr" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3mYdg7" id="492bFERo4qM" role="3F10Kt">
+          <property role="1413C4" value="fun" />
+        </node>
       </node>
       <node concept="3F1sOY" id="3_qfG1EP6OC" role="3EZMnx">
         <property role="1$x2rV" value="*" />
@@ -1033,34 +801,45 @@
         <node concept="pkWqt" id="4rRw8_Av_at" role="pqm2j">
           <node concept="3clFbS" id="4rRw8_Av_au" role="2VODD2">
             <node concept="3clFbF" id="4rRw8_Av_hW" role="3cqZAp">
-              <node concept="22lmx$" id="4rRw8_Av_hX" role="3clFbG">
-                <node concept="3clFbC" id="4rRw8_Av_hY" role="3uHU7B">
-                  <node concept="28GBK8" id="4rRw8_Av_hZ" role="3uHU7B">
-                    <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
-                    <ref role="28H3Ia" to="8tt8:3_qfG1EP6Op" resolve="argType" />
-                  </node>
-                  <node concept="2OqwBi" id="4rRw8_Av_i0" role="3uHU7w">
-                    <node concept="pncrf" id="4rRw8_Av_i1" role="2Oq$k0" />
-                    <node concept="25OxAV" id="4rRw8_Av_i2" role="2OqNvi" />
-                  </node>
+              <node concept="3clFbC" id="4rRw8_Av_hY" role="3clFbG">
+                <node concept="28GBK8" id="4rRw8_Av_hZ" role="3uHU7B">
+                  <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
+                  <ref role="28H3Ia" to="8tt8:3_qfG1EP6Op" resolve="argType" />
                 </node>
-                <node concept="3clFbC" id="4rRw8_Av_i3" role="3uHU7w">
-                  <node concept="28GBK8" id="4rRw8_Av_i4" role="3uHU7B">
-                    <ref role="28GBKb" to="8tt8:3_qfG1EP6Of" resolve="FunType" />
-                    <ref role="28H3Ia" to="8tt8:3_qfG1EP6O_" resolve="resType" />
-                  </node>
-                  <node concept="2OqwBi" id="4rRw8_Av_i5" role="3uHU7w">
-                    <node concept="pncrf" id="4rRw8_Av_i6" role="2Oq$k0" />
-                    <node concept="25OxAV" id="4rRw8_Av_i7" role="2OqNvi" />
-                  </node>
+                <node concept="2OqwBi" id="4rRw8_Av_i0" role="3uHU7w">
+                  <node concept="pncrf" id="4rRw8_Av_i1" role="2Oq$k0" />
+                  <node concept="25OxAV" id="4rRw8_Av_i2" role="2OqNvi" />
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3mYdg7" id="492bFERo4AB" role="3F10Kt">
+          <property role="1413C4" value="fun" />
+        </node>
       </node>
       <node concept="l2Vlx" id="3_qfG1EP6Ol" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="492bFERogng">
+    <property role="3GE5qa" value="expr.const" />
+    <ref role="1XX52x" to="8tt8:492bFERognf" resolve="True" />
+    <node concept="3EZMnI" id="492bFERognr" role="2wV5jI">
+      <node concept="PMmxH" id="492bFERogny" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="l2Vlx" id="492bFERognu" role="2iSdaV" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="492bFERojSo">
+    <property role="3GE5qa" value="expr.const" />
+    <ref role="1XX52x" to="8tt8:492bFERojSn" resolve="False" />
+    <node concept="3EZMnI" id="492bFERojSq" role="2wV5jI">
+      <node concept="PMmxH" id="492bFERojSx" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="l2Vlx" id="492bFERojSt" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/structure.mps b/samples/lambdacalc/languages/sample.fooblin/models/structure.mps
index 16ea986f..bc224d4d 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/structure.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/structure.mps
@@ -16,7 +16,6 @@
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
-        <child id="1071489727084" name="propertyDeclaration" index="1TKVEl" />
       </concept>
       <concept id="1169127622168" name="jetbrains.mps.lang.structure.structure.InterfaceConceptReference" flags="ig" index="PrWs8">
         <reference id="1169127628841" name="intfc" index="PrY4T" />
@@ -26,10 +25,6 @@
         <reference id="1071489389519" name="extends" index="1TJDcQ" />
         <child id="1169129564478" name="implements" index="PzmwI" />
       </concept>
-      <concept id="1071489288299" name="jetbrains.mps.lang.structure.structure.PropertyDeclaration" flags="ig" index="1TJgyi">
-        <property id="241647608299431129" name="propertyId" index="IQ2nx" />
-        <reference id="1082985295845" name="dataType" index="AX2Wp" />
-      </concept>
       <concept id="1071489288298" name="jetbrains.mps.lang.structure.structure.LinkDeclaration" flags="ig" index="1TJgyj">
         <property id="1071599776563" name="role" index="20kJfa" />
         <property id="1071599893252" name="sourceCardinality" index="20lbJX" />
@@ -224,28 +219,6 @@
       <ref role="20lvS9" node="7_8aRkgDGPJ" resolve="Expr" />
     </node>
   </node>
-  <node concept="1TIwiD" id="7_8aRkgDHBc">
-    <property role="EcuMT" value="8739282858702985676" />
-    <property role="3GE5qa" value="expr.const" />
-    <property role="TrG5h" value="StringConst" />
-    <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
-    <node concept="1TJgyi" id="7_8aRkgDHBd" role="1TKVEl">
-      <property role="IQ2nx" value="8739282858702985677" />
-      <property role="TrG5h" value="value" />
-      <ref role="AX2Wp" to="tpck:fKAOsGN" resolve="string" />
-    </node>
-  </node>
-  <node concept="1TIwiD" id="7_8aRkgDHBK">
-    <property role="EcuMT" value="8739282858702985712" />
-    <property role="3GE5qa" value="expr.const" />
-    <property role="TrG5h" value="NumConst" />
-    <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
-    <node concept="1TJgyi" id="7_8aRkgDHBL" role="1TKVEl">
-      <property role="IQ2nx" value="8739282858702985713" />
-      <property role="TrG5h" value="value" />
-      <ref role="AX2Wp" to="tpck:fKAQMTA" resolve="integer" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="7_8aRkgEZ_W">
     <property role="EcuMT" value="8739282858703321468" />
     <property role="3GE5qa" value="clause" />
@@ -268,18 +241,6 @@
     <property role="3GE5qa" value="type" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
   </node>
-  <node concept="1TIwiD" id="3_qfG1EP6NP">
-    <property role="EcuMT" value="4132684604212800757" />
-    <property role="TrG5h" value="StrType" />
-    <property role="3GE5qa" value="type" />
-    <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
-  </node>
-  <node concept="1TIwiD" id="3_qfG1EP6O2">
-    <property role="EcuMT" value="4132684604212800770" />
-    <property role="TrG5h" value="NumType" />
-    <property role="3GE5qa" value="type" />
-    <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
-  </node>
   <node concept="1TIwiD" id="3_qfG1EP6Of">
     <property role="EcuMT" value="4132684604212800783" />
     <property role="TrG5h" value="FunType" />
@@ -300,5 +261,26 @@
       <ref role="20lvS9" node="3_qfG1EP6Nw" resolve="Type" />
     </node>
   </node>
+  <node concept="1TIwiD" id="492bFERodLp">
+    <property role="EcuMT" value="4774429934441520217" />
+    <property role="3GE5qa" value="type" />
+    <property role="TrG5h" value="BoolType" />
+    <property role="34LRSv" value="bool" />
+    <ref role="1TJDcQ" node="3_qfG1EP6Nw" resolve="Type" />
+  </node>
+  <node concept="1TIwiD" id="492bFERognf">
+    <property role="EcuMT" value="4774429934441530831" />
+    <property role="3GE5qa" value="expr.const" />
+    <property role="TrG5h" value="True" />
+    <property role="34LRSv" value="true" />
+    <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
+  </node>
+  <node concept="1TIwiD" id="492bFERojSn">
+    <property role="EcuMT" value="4774429934441545239" />
+    <property role="3GE5qa" value="expr.const" />
+    <property role="TrG5h" value="False" />
+    <property role="34LRSv" value="false" />
+    <ref role="1TJDcQ" node="7_8aRkgDGQe" resolve="Const" />
+  </node>
 </model>
 
diff --git a/samples/lambdacalc/languages/sample.fooblin/models/types.mps b/samples/lambdacalc/languages/sample.fooblin/models/types.mps
index e99405e2..e8f2b37a 100644
--- a/samples/lambdacalc/languages/sample.fooblin/models/types.mps
+++ b/samples/lambdacalc/languages/sample.fooblin/models/types.mps
@@ -10,8 +10,8 @@
     <import index="8tt8" ref="r:e74c1bfc-387b-4b4b-abee-2eb77ee510ec(sample.fooblin.structure)" />
     <import index="hano" ref="r:2b43b673-12f9-49ea-8e43-d0c7a401586a(jetbrains.mps.lang.typesystem2.typechecking)" />
     <import index="1x08" ref="r:9dec6437-6097-4be2-891f-1792da0df61f(sample.fooblin.behavior)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="6bz1" ref="r:d3905048-7598-4a84-931a-cbbcbcda146d(jetbrains.mps.lang.intentions.methods)" implicit="true" />
   </imports>
   <registry>
@@ -226,6 +226,10 @@
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
       </concept>
+      <concept id="8335224865066016385" name="jetbrains.mps.lang.typesystem2.structure.NewTypeConstraint" flags="ng" index="AVZhr">
+        <reference id="1129524318932020868" name="typeDeclaration" index="WHOVA" />
+        <child id="7368070394768578348" name="typeVar" index="3A07fg" />
+      </concept>
       <concept id="8335224865066016388" name="jetbrains.mps.lang.typesystem2.structure.Rule" flags="ng" index="AVZhu">
         <child id="4340821131304055573" name="condition" index="30RCb4" />
       </concept>
@@ -314,24 +318,18 @@
   </registry>
   <node concept="0oKg$" id="3_qfG1EPgcF">
     <property role="TrG5h" value="types" />
-    <node concept="0oKvU" id="3_qfG1EPgcG" role="0oKgB">
-      <property role="TrG5h" value="Str" />
-      <ref role="3bZ5Sy" to="8tt8:3_qfG1EP6NP" resolve="StrType" />
-      <node concept="3tC51N" id="5dGkjBXlRez" role="3tC56T">
-        <property role="TrG5h" value="dummy" />
-        <node concept="3uibUv" id="5dGkjBXlReB" role="3tC51t">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="0oftK" id="3_qfG1EPgcH" role="0oKvZ">
-        <node concept="0ofun" id="3dV5CmlLMot" role="0ofug">
+    <node concept="0oKvU" id="492bFERodOY" role="0oKgB">
+      <property role="TrG5h" value="Bool" />
+      <ref role="3bZ5Sy" to="8tt8:492bFERodLp" resolve="BoolType" />
+      <node concept="0oftK" id="492bFERodOZ" role="0oKvZ">
+        <node concept="0ofun" id="492bFERoe4_" role="0ofug">
           <property role="TrG5h" value="concept" />
-          <node concept="3AP2Rn" id="3dV5CmlLMo_" role="3AP2R9">
-            <node concept="3clFbS" id="3dV5CmlLMoA" role="16YjZG">
-              <node concept="3clFbF" id="3dV5CmlLO$h" role="3cqZAp">
-                <node concept="2OqwBi" id="3dV5CmlLOUK" role="3clFbG">
-                  <node concept="3tJrKC" id="3dV5CmlLOGz" role="2Oq$k0" />
-                  <node concept="liA8E" id="3dV5CmlLQ5f" role="2OqNvi">
+          <node concept="3AP2Rn" id="492bFERoe4G" role="3AP2R9">
+            <node concept="3clFbS" id="492bFERoe4H" role="16YjZG">
+              <node concept="3clFbF" id="492bFERoe4U" role="3cqZAp">
+                <node concept="2OqwBi" id="492bFERoej8" role="3clFbG">
+                  <node concept="3tJrKC" id="492bFERoe4T" role="2Oq$k0" />
+                  <node concept="liA8E" id="492bFERoeF_" role="2OqNvi">
                     <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
                   </node>
                 </node>
@@ -340,49 +338,12 @@
           </node>
         </node>
       </node>
-      <node concept="1ImKlm" id="3_qfG1EPgcJ" role="1ImLg5">
-        <node concept="3clFbS" id="3_qfG1EPgcK" role="16YjZG">
-          <node concept="3clFbF" id="3dV5CmlLQfU" role="3cqZAp">
-            <node concept="2OqwBi" id="3dV5CmlLQsw" role="3clFbG">
-              <node concept="3tJrKC" id="3dV5CmlLQfS" role="2Oq$k0" />
-              <node concept="LFhST" id="3dV5CmlLQLY" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="0oKvU" id="3_qfG1EPl91" role="0oKgB">
-      <property role="TrG5h" value="Num" />
-      <ref role="3bZ5Sy" to="8tt8:3_qfG1EP6O2" resolve="NumType" />
-      <node concept="3tC51N" id="5dGkjBXlReF" role="3tC56T">
-        <property role="TrG5h" value="dummy" />
-        <node concept="3uibUv" id="5dGkjBXlReJ" role="3tC51t">
-          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-        </node>
-      </node>
-      <node concept="0oftK" id="3_qfG1EPl92" role="0oKvZ">
-        <node concept="0ofun" id="3dV5CmlLQWf" role="0ofug">
-          <property role="TrG5h" value="concept" />
-          <node concept="3AP2Rn" id="3dV5CmlLQWg" role="3AP2R9">
-            <node concept="3clFbS" id="3dV5CmlLQWh" role="16YjZG">
-              <node concept="3clFbF" id="3dV5CmlLQWi" role="3cqZAp">
-                <node concept="2OqwBi" id="3dV5CmlLQWj" role="3clFbG">
-                  <node concept="3tJrKC" id="3dV5CmlLQWk" role="2Oq$k0" />
-                  <node concept="liA8E" id="3dV5CmlLQWl" role="2OqNvi">
-                    <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1ImKlm" id="3_qfG1EPl98" role="1ImLg5">
-        <node concept="3clFbS" id="3_qfG1EPl99" role="16YjZG">
-          <node concept="3clFbF" id="3dV5CmlLR1k" role="3cqZAp">
-            <node concept="2OqwBi" id="3dV5CmlLR1l" role="3clFbG">
-              <node concept="3tJrKC" id="3dV5CmlLR1m" role="2Oq$k0" />
-              <node concept="LFhST" id="3dV5CmlLR1n" role="2OqNvi" />
+      <node concept="1ImKlm" id="492bFERodP1" role="1ImLg5">
+        <node concept="3clFbS" id="492bFERodP2" role="16YjZG">
+          <node concept="3clFbF" id="492bFERoeKM" role="3cqZAp">
+            <node concept="2OqwBi" id="492bFERoeZ0" role="3clFbG">
+              <node concept="3tJrKC" id="492bFERoeKL" role="2Oq$k0" />
+              <node concept="LFhST" id="492bFERog36" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -490,101 +451,81 @@
   </node>
   <node concept="AVZre" id="5dGkjBXlLmT">
     <property role="TrG5h" value="typeOf" />
-    <node concept="AVZhu" id="5dGkjBXlLmW" role="3ArX_J">
-      <property role="TrG5h" value="typeOf_StringConst" />
-      <node concept="2t___k" id="5dGkjBXlLn5" role="20_v8_">
-        <ref role="2t_S0q" to="8tt8:7_8aRkgDHBc" resolve="StringConst" />
-        <node concept="3A20r5" id="5dGkjBXlLn6" role="2t_VXX">
-          <property role="TrG5h" value="str" />
-        </node>
-      </node>
-      <node concept="3Aq9E8" id="5dGkjBXlLnr" role="3otmyu">
-        <node concept="3NuqgR" id="5dGkjBXmlUM" role="3Nuqhd">
-          <node concept="aZer4" id="5dGkjBXmlUN" role="3XD1gS">
+    <node concept="AVZhu" id="492bFERogfi" role="3ArX_J">
+      <property role="TrG5h" value="typeOf_TrueConst" />
+      <node concept="3Aq9E8" id="492bFERognK" role="3otmyu">
+        <node concept="3NuqgR" id="492bFERognO" role="3Nuqhd">
+          <node concept="aZer4" id="492bFERognP" role="3XD1gS">
             <property role="TrG5h" value="T" />
           </node>
         </node>
-        <node concept="3clFbS" id="5dGkjBXlLns" role="3Aqf5P">
-          <node concept="3Aqczg" id="5dGkjBXmlU_" role="3cqZAp">
-            <node concept="3A8Hvi" id="5dGkjBXmlUv" role="3Aqpz8">
-              <node concept="a7P8L" id="5dGkjBXmlUW" role="3A8wtg">
-                <ref role="a7OzE" node="5dGkjBXmlUN" resolve="T" />
-              </node>
-              <node concept="1Q4cc8" id="5dGkjBXmlV1" role="3A8w4Q">
-                <ref role="1Q4cdn" node="3_qfG1EPgcG" resolve="Str" />
-                <node concept="1Q7qz5" id="5dGkjBXmlV2" role="1Q7vaU">
-                  <node concept="1Q7q5z" id="5dGkjBXmlV3" role="1Q7qz4">
-                    <ref role="1Q7tcy" node="5dGkjBXlRez" resolve="dummy" />
-                    <node concept="3cmrfG" id="5dGkjBXmxR8" role="1KxKwY">
-                      <property role="3cmrfH" value="42" />
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbS" id="492bFERognL" role="3Aqf5P">
+          <node concept="3Aqczg" id="492bFERogo0" role="3cqZAp">
+            <node concept="AVZhr" id="492bFERognY" role="3Aqpz8">
+              <ref role="WHOVA" node="492bFERodOY" resolve="Bool" />
+              <node concept="a7P8L" id="492bFERogo4" role="3A07fg">
+                <ref role="a7OzE" node="492bFERognP" resolve="T" />
               </node>
             </node>
           </node>
-          <node concept="3Aqczg" id="5dGkjBXlM9v" role="3cqZAp">
-            <node concept="3XxkQB" id="5dGkjBXlM9r" role="3Aqpz8">
-              <node concept="aYllk" id="5dGkjBXlM9s" role="3XxmmS">
-                <node concept="3A2sRY" id="5dGkjBXlMdb" role="aYrYs">
-                  <ref role="3A2yKK" node="5dGkjBXlLn6" resolve="str" />
+          <node concept="3Aqczg" id="492bFERogoJ" role="3cqZAp">
+            <node concept="3XxkQB" id="492bFERogoB" role="3Aqpz8">
+              <node concept="aYllk" id="492bFERogoD" role="3XxmmS">
+                <node concept="3A2sRY" id="492bFERogoV" role="aYrYs">
+                  <ref role="3A2yKK" node="492bFERogn9" resolve="trueConst" />
                 </node>
               </node>
-              <node concept="a7P8L" id="5dGkjBXmlVd" role="3Xxm5W">
-                <ref role="a7OzE" node="5dGkjBXmlUN" resolve="T" />
+              <node concept="a7P8L" id="492bFERogp3" role="3Xxm5W">
+                <ref role="a7OzE" node="492bFERognP" resolve="T" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="2t___k" id="492bFERogn8" role="20_v8_">
+        <ref role="2t_S0q" to="8tt8:492bFERognf" resolve="True" />
+        <node concept="3A20r5" id="492bFERogn9" role="2t_VXX">
+          <property role="TrG5h" value="trueConst" />
+        </node>
+      </node>
     </node>
-    <node concept="AVZhu" id="5dGkjBXlSp4" role="3ArX_J">
-      <property role="TrG5h" value="typeOf_NumConst" />
-      <node concept="2t___k" id="5dGkjBXlSp5" role="20_v8_">
-        <ref role="2t_S0q" to="8tt8:7_8aRkgDHBK" resolve="NumConst" />
-        <node concept="3A20r5" id="5dGkjBXlSp6" role="2t_VXX">
-          <property role="TrG5h" value="num" />
-        </node>
-      </node>
-      <node concept="3Aq9E8" id="5dGkjBXlSp7" role="3otmyu">
-        <node concept="3NuqgR" id="5dGkjBXmlVi" role="3Nuqhd">
-          <node concept="aZer4" id="5dGkjBXmlVj" role="3XD1gS">
+    <node concept="AVZhu" id="492bFERojTR" role="3ArX_J">
+      <property role="TrG5h" value="typeOf_FalseConst" />
+      <node concept="3Aq9E8" id="492bFERojTS" role="3otmyu">
+        <node concept="3NuqgR" id="492bFERojTT" role="3Nuqhd">
+          <node concept="aZer4" id="492bFERojTU" role="3XD1gS">
             <property role="TrG5h" value="T" />
           </node>
         </node>
-        <node concept="3clFbS" id="5dGkjBXlSp8" role="3Aqf5P">
-          <node concept="3Aqczg" id="5dGkjBXmlVG" role="3cqZAp">
-            <node concept="3A8Hvi" id="5dGkjBXmlVA" role="3Aqpz8">
-              <node concept="a7P8L" id="5dGkjBXmlVT" role="3A8wtg">
-                <ref role="a7OzE" node="5dGkjBXmlVj" resolve="T" />
-              </node>
-              <node concept="1Q4cc8" id="5dGkjBXlSq5" role="3A8w4Q">
-                <ref role="1Q4cdn" node="3_qfG1EPl91" resolve="Num" />
-                <node concept="1Q7qz5" id="5dGkjBXlSqa" role="1Q7vaU">
-                  <node concept="1Q7q5z" id="5dGkjBXlSqh" role="1Q7qz4">
-                    <ref role="1Q7tcy" node="5dGkjBXlReF" resolve="dummy" />
-                    <node concept="3cmrfG" id="5dGkjBXmxRd" role="1KxKwY">
-                      <property role="3cmrfH" value="42" />
-                    </node>
-                  </node>
-                </node>
+        <node concept="3clFbS" id="492bFERojTV" role="3Aqf5P">
+          <node concept="3Aqczg" id="492bFERojTW" role="3cqZAp">
+            <node concept="AVZhr" id="492bFERojTX" role="3Aqpz8">
+              <ref role="WHOVA" node="492bFERodOY" resolve="Bool" />
+              <node concept="a7P8L" id="492bFERojTY" role="3A07fg">
+                <ref role="a7OzE" node="492bFERojTU" resolve="T" />
               </node>
             </node>
           </node>
-          <node concept="3Aqczg" id="5dGkjBXlSp9" role="3cqZAp">
-            <node concept="3XxkQB" id="5dGkjBXlSpa" role="3Aqpz8">
-              <node concept="aYllk" id="5dGkjBXlSpb" role="3XxmmS">
-                <node concept="3A2sRY" id="5dGkjBXlSpc" role="aYrYs">
-                  <ref role="3A2yKK" node="5dGkjBXlSp6" resolve="num" />
+          <node concept="3Aqczg" id="492bFERojTZ" role="3cqZAp">
+            <node concept="3XxkQB" id="492bFERojU0" role="3Aqpz8">
+              <node concept="aYllk" id="492bFERojU1" role="3XxmmS">
+                <node concept="3A2sRY" id="492bFERojU2" role="aYrYs">
+                  <ref role="3A2yKK" node="492bFERojU5" resolve="falseConst" />
                 </node>
               </node>
-              <node concept="a7P8L" id="5dGkjBXmlW5" role="3Xxm5W">
-                <ref role="a7OzE" node="5dGkjBXmlVj" resolve="T" />
+              <node concept="a7P8L" id="492bFERojU3" role="3Xxm5W">
+                <ref role="a7OzE" node="492bFERojTU" resolve="T" />
               </node>
             </node>
           </node>
         </node>
       </node>
+      <node concept="2t___k" id="492bFERojU4" role="20_v8_">
+        <ref role="2t_S0q" to="8tt8:492bFERojSn" resolve="False" />
+        <node concept="3A20r5" id="492bFERojU5" role="2t_VXX">
+          <property role="TrG5h" value="falseConst" />
+        </node>
+      </node>
     </node>
     <node concept="AVZhu" id="3dV5CmlMdve" role="3ArX_J">
       <property role="TrG5h" value="typeOf_Var" />
diff --git a/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps b/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps
index a57c0ef8..9c1519a0 100644
--- a/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps
+++ b/samples/lambdacalc/solutions/sample.demo/models/sample/demo/fooblah.mps
@@ -27,12 +27,6 @@
         <child id="8739282858702982549" name="expr" index="1DVIrw" />
         <child id="8739282858702982544" name="bind" index="1DVIr_" />
       </concept>
-      <concept id="8739282858702985712" name="sample.fooblin.structure.NumConst" flags="ng" index="1DVJa5">
-        <property id="8739282858702985713" name="value" index="1DVJa4" />
-      </concept>
-      <concept id="8739282858702985676" name="sample.fooblin.structure.StringConst" flags="ng" index="1DVJaT">
-        <property id="8739282858702985677" name="value" index="1DVJaS" />
-      </concept>
       <concept id="8739282858702985614" name="sample.fooblin.structure.LetClause" flags="ng" index="1DVJbV">
         <child id="8739282858702985617" name="expr" index="1DVJb$" />
         <child id="8739282858702985615" name="var" index="1DVJbU" />
@@ -41,50 +35,163 @@
   </registry>
   <node concept="1DVIrt" id="7_8aRkgE06U">
     <property role="TrG5h" value="Demo1" />
-    <node concept="1DVJbV" id="7_8aRkgE06X" role="1DVIru">
-      <node concept="1DVIoH" id="7_8aRkgE06Z" role="1DVJbU">
-        <property role="TrG5h" value="v" />
+    <node concept="1DVJbV" id="492bFERo3kV" role="1DVIru">
+      <node concept="1DVIoH" id="492bFERo3kX" role="1DVJbU">
+        <property role="TrG5h" value="zero" />
       </node>
-      <node concept="1DVJa5" id="7_8aRkgE076" role="1DVJb$">
-        <property role="1DVJa4" value="2" />
-      </node>
-    </node>
-    <node concept="1DVJbV" id="44a9n8Es6Qy" role="1DVIru">
-      <node concept="1DVIoH" id="44a9n8Es6Q$" role="1DVJbU">
-        <property role="TrG5h" value="w" />
-      </node>
-      <node concept="1DVIo5" id="4ZByBOoFgQW" role="1DVJb$">
-        <node concept="1DVIrU" id="4ZByBOoFgQ_" role="1DVIo4">
-          <node concept="1DVIrB" id="4ZByBOoFgQH" role="1DVIr_">
-            <node concept="1DVIoH" id="4ZByBOoFgQx" role="1DVIrA">
-              <property role="TrG5h" value="y" />
-            </node>
+      <node concept="1DVIrU" id="492bFERo3lK" role="1DVJb$">
+        <node concept="1DVIrU" id="492bFERo3m9" role="1DVIrw">
+          <node concept="1DVIoH" id="492bFERo3mu" role="1DVIrw">
+            <property role="TrG5h" value="x" />
           </node>
-          <node concept="1DVIoH" id="4rRw8_Avoyv" role="1DVIrw">
-            <property role="TrG5h" value="y" />
+          <node concept="1DVIrB" id="492bFERo3mh" role="1DVIr_">
+            <node concept="1DVIoH" id="492bFERo3m5" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
           </node>
         </node>
-        <node concept="1DVIo5" id="6siydCyjxU0" role="1DVIo8">
-          <node concept="1DVJaT" id="6siydCyjxUp" role="1DVIo8">
-            <property role="1DVJaS" value="asd" />
+        <node concept="1DVIrB" id="492bFERo3lS" role="1DVIr_">
+          <node concept="1DVIoH" id="492bFERo3lG" role="1DVIrA">
+            <property role="TrG5h" value="f" />
           </node>
-          <node concept="1DVIrU" id="44a9n8Es6R8" role="1DVIo4">
-            <node concept="1DVIrB" id="44a9n8Es6Rg" role="1DVIr_">
-              <node concept="1DVIoH" id="44a9n8Es6R4" role="1DVIrA">
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="492bFERo7Ll" role="1DVIru">
+      <node concept="1DVIoH" id="492bFERo7Ln" role="1DVJbU">
+        <property role="TrG5h" value="one" />
+      </node>
+      <node concept="1DVIrU" id="492bFERo7LF" role="1DVJb$">
+        <node concept="1DVIrU" id="492bFERo7M4" role="1DVIrw">
+          <node concept="1DVIo5" id="492bFERo7Mu" role="1DVIrw">
+            <node concept="1DVIoH" id="492bFERo7Mp" role="1DVIo4">
+              <property role="TrG5h" value="f" />
+            </node>
+            <node concept="1DVIoH" id="492bFERo7Mt" role="1DVIo8">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+          <node concept="1DVIrB" id="492bFERo7Mc" role="1DVIr_">
+            <node concept="1DVIoH" id="492bFERo7M0" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DVIrB" id="492bFERo7LN" role="1DVIr_">
+          <node concept="1DVIoH" id="492bFERo7LB" role="1DVIrA">
+            <property role="TrG5h" value="f" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="492bFERo7Nd" role="1DVIru">
+      <node concept="1DVIoH" id="492bFERo7Nf" role="1DVJbU">
+        <property role="TrG5h" value="two" />
+      </node>
+      <node concept="1DVIrU" id="492bFERo7NI" role="1DVJb$">
+        <node concept="1DVIrU" id="492bFERo7O7" role="1DVIrw">
+          <node concept="1DVIrB" id="492bFERo7Of" role="1DVIr_">
+            <node concept="1DVIoH" id="492bFERo7O3" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+          <node concept="1DVIo5" id="492bFERo7OP" role="1DVIrw">
+            <node concept="1DVIoH" id="492bFERo7OK" role="1DVIo4">
+              <property role="TrG5h" value="f" />
+            </node>
+            <node concept="1DVIo5" id="492bFERo7P3" role="1DVIo8">
+              <node concept="1DVIoH" id="492bFERo7OO" role="1DVIo4">
+                <property role="TrG5h" value="f" />
+              </node>
+              <node concept="1DVIoH" id="492bFERo7P2" role="1DVIo8">
                 <property role="TrG5h" value="x" />
               </node>
             </node>
-            <node concept="1DVIrU" id="4rRw8_Avoz9" role="1DVIrw">
-              <node concept="1DVIoH" id="4rRw8_Avozu" role="1DVIrw">
-                <property role="TrG5h" value="x" />
+          </node>
+        </node>
+        <node concept="1DVIrB" id="492bFERo7NQ" role="1DVIr_">
+          <node concept="1DVIoH" id="492bFERo7NE" role="1DVIrA">
+            <property role="TrG5h" value="f" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="492bFERo7Sb" role="1DVIru">
+      <node concept="1DVIoH" id="492bFERo7Sd" role="1DVJbU">
+        <property role="TrG5h" value="three" />
+      </node>
+      <node concept="1DVIrU" id="492bFERo7ST" role="1DVJb$">
+        <node concept="1DVIrU" id="492bFERo7Ti" role="1DVIrw">
+          <node concept="1DVIo5" id="492bFERo7TG" role="1DVIrw">
+            <node concept="1DVIoH" id="492bFERo7TB" role="1DVIo4">
+              <property role="TrG5h" value="f" />
+            </node>
+            <node concept="1DVIo5" id="492bFERo7TU" role="1DVIo8">
+              <node concept="1DVIoH" id="492bFERo7TF" role="1DVIo4">
+                <property role="TrG5h" value="f" />
               </node>
-              <node concept="1DVIrB" id="4rRw8_Avozh" role="1DVIr_">
-                <node concept="1DVIoH" id="4rRw8_Avoz5" role="1DVIrA">
-                  <property role="TrG5h" value="z" />
+              <node concept="1DVIo5" id="492bFERo7Ua" role="1DVIo8">
+                <node concept="1DVIoH" id="492bFERo7TT" role="1DVIo4">
+                  <property role="TrG5h" value="f" />
+                </node>
+                <node concept="1DVIoH" id="492bFERo7U9" role="1DVIo8">
+                  <property role="TrG5h" value="x" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="1DVIrB" id="492bFERo7Tq" role="1DVIr_">
+            <node concept="1DVIoH" id="492bFERo7Te" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DVIrB" id="492bFERo7T1" role="1DVIr_">
+          <node concept="1DVIoH" id="492bFERo7SP" role="1DVIrA">
+            <property role="TrG5h" value="f" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1DVJbV" id="492bFERodtO" role="1DVIru">
+      <node concept="1DVIoH" id="492bFERodtP" role="1DVJbU">
+        <property role="TrG5h" value="four" />
+      </node>
+      <node concept="1DVIrU" id="492bFERodtQ" role="1DVJb$">
+        <node concept="1DVIrU" id="492bFERodtR" role="1DVIrw">
+          <node concept="1DVIo5" id="492bFERodtS" role="1DVIrw">
+            <node concept="1DVIoH" id="492bFERodtT" role="1DVIo4">
+              <property role="TrG5h" value="f" />
+            </node>
+            <node concept="1DVIo5" id="492bFERodtU" role="1DVIo8">
+              <node concept="1DVIoH" id="492bFERodtV" role="1DVIo4">
+                <property role="TrG5h" value="f" />
+              </node>
+              <node concept="1DVIo5" id="492bFERodvr" role="1DVIo8">
+                <node concept="1DVIoH" id="492bFERodvm" role="1DVIo4">
+                  <property role="TrG5h" value="f" />
+                </node>
+                <node concept="1DVIo5" id="492bFERodvD" role="1DVIo8">
+                  <node concept="1DVIoH" id="492bFERodvq" role="1DVIo4">
+                    <property role="TrG5h" value="f" />
+                  </node>
+                  <node concept="1DVIoH" id="492bFERodvC" role="1DVIo8">
+                    <property role="TrG5h" value="x" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1DVIrB" id="492bFERodtZ" role="1DVIr_">
+            <node concept="1DVIoH" id="492bFERodu0" role="1DVIrA">
+              <property role="TrG5h" value="x" />
+            </node>
+          </node>
+        </node>
+        <node concept="1DVIrB" id="492bFERodu1" role="1DVIr_">
+          <node concept="1DVIoH" id="492bFERodu2" role="1DVIrA">
+            <property role="TrG5h" value="f" />
+          </node>
         </node>
       </node>
     </node>