diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
index 3b1b754f..b32db56b 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/jetbrains.mps.lang.typechecking.generator.genutil.mps
@@ -19,6 +19,9 @@
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <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" />
@@ -33,7 +36,6 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -57,12 +59,16 @@
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
       <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="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>
@@ -107,6 +113,7 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
       <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
@@ -176,65 +183,67 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="2GOEA2mESW" role="3cqZAp">
-          <node concept="3cpWsn" id="2GOEA2mESX" role="3cpWs9">
-            <property role="TrG5h" value="rl" />
-            <node concept="3Tqbb2" id="2GOEA2mESY" role="1tU5fm">
-              <ref role="ehGHo" to="wq2x:7eGEHDlgPKk" resolve="RulesList" />
-            </node>
-            <node concept="2OqwBi" id="2GOEA2mESZ" role="33vP2m">
-              <node concept="37vLTw" id="2GOEA2mET0" role="2Oq$k0">
-                <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
-              </node>
-              <node concept="1iwH7d" id="2GOEA2mET1" role="2OqNvi">
-                <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
-                <node concept="2OqwBi" id="2GOEA2mET2" role="DUT31">
-                  <node concept="2OqwBi" id="2GOEA2mET3" role="2Oq$k0">
-                    <node concept="37vLTw" id="2GOEA2mET4" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2GOEA2mESO" resolve="qs" />
-                    </node>
-                    <node concept="1uHKPH" id="2GOEA2mET5" role="2OqNvi" />
-                  </node>
-                  <node concept="I4A8Y" id="2GOEA2mET6" role="2OqNvi" />
+        <node concept="3cpWs8" id="1ZdxAP9y1hX" role="3cqZAp">
+          <node concept="3cpWsn" id="1ZdxAP9y1hY" role="3cpWs9">
+            <property role="TrG5h" value="qsmodel" />
+            <node concept="H_c77" id="1ZdxAP9xY6D" role="1tU5fm" />
+            <node concept="2OqwBi" id="1ZdxAP9y1hZ" role="33vP2m">
+              <node concept="2OqwBi" id="1ZdxAP9y1i0" role="2Oq$k0">
+                <node concept="37vLTw" id="1ZdxAP9y1i1" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2GOEA2mESO" resolve="qs" />
                 </node>
+                <node concept="1uHKPH" id="1ZdxAP9y1i2" role="2OqNvi" />
               </node>
+              <node concept="I4A8Y" id="1ZdxAP9y1i3" role="2OqNvi" />
             </node>
           </node>
         </node>
         <node concept="3clFbJ" id="2GOEA2mET7" role="3cqZAp">
           <node concept="3clFbS" id="2GOEA2mET8" role="3clFbx">
-            <node concept="3clFbF" id="2GOEA2mET9" role="3cqZAp">
-              <node concept="37vLTI" id="2GOEA2mETa" role="3clFbG">
-                <node concept="2OqwBi" id="2GOEA2mETb" role="37vLTx">
-                  <node concept="37vLTw" id="2GOEA2mETc" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
-                  </node>
-                  <node concept="1iwH7d" id="2GOEA2mETd" role="2OqNvi">
-                    <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
-                    <node concept="2OqwBi" id="2GOEA2mETe" role="DUT31">
-                      <node concept="37vLTw" id="2GOEA2mETf" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
-                      </node>
-                      <node concept="1r8y6K" id="2GOEA2mETg" role="2OqNvi" />
-                    </node>
-                  </node>
+            <node concept="3cpWs6" id="1ZdxAP9y5Wo" role="3cqZAp">
+              <node concept="2OqwBi" id="1ZdxAP9y6X4" role="3cqZAk">
+                <node concept="37vLTw" id="1ZdxAP9y6X5" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
                 </node>
-                <node concept="37vLTw" id="2GOEA2mETh" role="37vLTJ">
-                  <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+                <node concept="1iwH7d" id="1ZdxAP9y6X6" role="2OqNvi">
+                  <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
+                  <node concept="2OqwBi" id="1ZdxAP9y6X7" role="DUT31">
+                    <node concept="37vLTw" id="1ZdxAP9y6X8" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+                    </node>
+                    <node concept="1r8y6K" id="1ZdxAP9y6X9" role="2OqNvi" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
           <node concept="3clFbC" id="2GOEA2mETi" role="3clFbw">
-            <node concept="10Nm6u" id="2GOEA2mETj" role="3uHU7w" />
             <node concept="37vLTw" id="2GOEA2mETk" role="3uHU7B">
-              <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+              <ref role="3cqZAo" node="1ZdxAP9y1hY" resolve="qsmodel" />
+            </node>
+            <node concept="2OqwBi" id="1ZdxAP9y3cY" role="3uHU7w">
+              <node concept="37vLTw" id="1ZdxAP9y3cZ" role="2Oq$k0">
+                <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+              </node>
+              <node concept="1st3f0" id="1ZdxAP9y3d0" role="2OqNvi" />
             </node>
           </node>
-        </node>
-        <node concept="3clFbF" id="2GOEA2mFDq" role="3cqZAp">
-          <node concept="37vLTw" id="2GOEA2mFDo" role="3clFbG">
-            <ref role="3cqZAo" node="2GOEA2mESX" resolve="rl" />
+          <node concept="9aQIb" id="1ZdxAP9y3zE" role="9aQIa">
+            <node concept="3clFbS" id="1ZdxAP9y3zF" role="9aQI4">
+              <node concept="3cpWs6" id="1ZdxAP9y67j" role="3cqZAp">
+                <node concept="2OqwBi" id="1ZdxAP9y79k" role="3cqZAk">
+                  <node concept="37vLTw" id="1ZdxAP9y79l" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2GOEA2mESI" resolve="gencontext" />
+                  </node>
+                  <node concept="1iwH7d" id="1ZdxAP9y79m" role="2OqNvi">
+                    <ref role="1iwH7c" to="osbg:4LE1vMPhNy4" resolve="recoverTypeDefault" />
+                    <node concept="37vLTw" id="1ZdxAP9y79n" role="DUT31">
+                      <ref role="3cqZAo" node="1ZdxAP9y1hY" resolve="qsmodel" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -381,29 +390,27 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="1ZdxAP9y7nN" role="3cqZAp">
+          <node concept="3cpWsn" id="1ZdxAP9y7nO" role="3cpWs9">
+            <property role="TrG5h" value="qsmodel" />
+            <node concept="H_c77" id="1ZdxAP9xY6q" role="1tU5fm" />
+            <node concept="2OqwBi" id="1ZdxAP9y7nP" role="33vP2m">
+              <node concept="2OqwBi" id="1ZdxAP9y7nQ" role="2Oq$k0">
+                <node concept="37vLTw" id="1ZdxAP9y7nR" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45N2P" resolve="qs" />
+                </node>
+                <node concept="1uHKPH" id="1ZdxAP9y7nS" role="2OqNvi" />
+              </node>
+              <node concept="I4A8Y" id="1ZdxAP9y7nT" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="7mIqwW45N2X" role="3cqZAp">
           <node concept="3cpWsn" id="7mIqwW45N2Y" role="3cpWs9">
             <property role="TrG5h" value="mt" />
             <node concept="3Tqbb2" id="7mIqwW45N2Z" role="1tU5fm">
               <ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
             </node>
-            <node concept="2OqwBi" id="7mIqwW45N30" role="33vP2m">
-              <node concept="37vLTw" id="7mIqwW45N31" role="2Oq$k0">
-                <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
-              </node>
-              <node concept="1iwH7d" id="7mIqwW45N32" role="2OqNvi">
-                <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
-                <node concept="2OqwBi" id="7mIqwW45N33" role="DUT31">
-                  <node concept="2OqwBi" id="7mIqwW45N34" role="2Oq$k0">
-                    <node concept="37vLTw" id="7mIqwW45N35" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7mIqwW45N2P" resolve="qs" />
-                    </node>
-                    <node concept="1uHKPH" id="7mIqwW45N36" role="2OqNvi" />
-                  </node>
-                  <node concept="I4A8Y" id="7mIqwW45N37" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3clFbJ" id="7mIqwW45N38" role="3cqZAp">
@@ -430,10 +437,37 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbC" id="7mIqwW45N3j" role="3clFbw">
-            <node concept="10Nm6u" id="7mIqwW45N3k" role="3uHU7w" />
-            <node concept="37vLTw" id="7mIqwW45N3l" role="3uHU7B">
-              <ref role="3cqZAo" node="7mIqwW45N2Y" resolve="rl" />
+          <node concept="3clFbC" id="1ZdxAP9y7Oq" role="3clFbw">
+            <node concept="37vLTw" id="1ZdxAP9y7Or" role="3uHU7B">
+              <ref role="3cqZAo" node="1ZdxAP9y7nO" resolve="qsmodel" />
+            </node>
+            <node concept="2OqwBi" id="1ZdxAP9y7Os" role="3uHU7w">
+              <node concept="37vLTw" id="1ZdxAP9y7Ot" role="2Oq$k0">
+                <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+              </node>
+              <node concept="1st3f0" id="1ZdxAP9y7Ou" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="1ZdxAP9y8ew" role="9aQIa">
+            <node concept="3clFbS" id="1ZdxAP9y8ex" role="9aQI4">
+              <node concept="3clFbF" id="1ZdxAP9y85e" role="3cqZAp">
+                <node concept="37vLTI" id="1ZdxAP9y85g" role="3clFbG">
+                  <node concept="2OqwBi" id="7mIqwW45N30" role="37vLTx">
+                    <node concept="37vLTw" id="7mIqwW45N31" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7mIqwW45N2J" resolve="gencontext" />
+                    </node>
+                    <node concept="1iwH7d" id="7mIqwW45N32" role="2OqNvi">
+                      <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                      <node concept="37vLTw" id="1ZdxAP9y7nU" role="DUT31">
+                        <ref role="3cqZAo" node="1ZdxAP9y7nO" resolve="qsmodel" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1ZdxAP9y85k" role="37vLTJ">
+                    <ref role="3cqZAo" node="7mIqwW45N2Y" resolve="mt" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -515,29 +549,27 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="1ZdxAP9y8QK" role="3cqZAp">
+          <node concept="3cpWsn" id="1ZdxAP9y8QL" role="3cpWs9">
+            <property role="TrG5h" value="qsmodel" />
+            <node concept="H_c77" id="1ZdxAP9xY6c" role="1tU5fm" />
+            <node concept="2OqwBi" id="1ZdxAP9y8QM" role="33vP2m">
+              <node concept="2OqwBi" id="1ZdxAP9y8QN" role="2Oq$k0">
+                <node concept="37vLTw" id="1ZdxAP9y8QO" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7mIqwW45Qoj" resolve="qs" />
+                </node>
+                <node concept="1uHKPH" id="1ZdxAP9y8QP" role="2OqNvi" />
+              </node>
+              <node concept="I4A8Y" id="1ZdxAP9y8QQ" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="7mIqwW45Qor" role="3cqZAp">
           <node concept="3cpWsn" id="7mIqwW45Qos" role="3cpWs9">
             <property role="TrG5h" value="mt" />
             <node concept="3Tqbb2" id="7mIqwW45Qot" role="1tU5fm">
               <ref role="ehGHo" to="wq2x:1pPth$m5B4X" resolve="MacroTable" />
             </node>
-            <node concept="2OqwBi" id="7mIqwW45Qou" role="33vP2m">
-              <node concept="37vLTw" id="7mIqwW45Qov" role="2Oq$k0">
-                <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
-              </node>
-              <node concept="1iwH7d" id="7mIqwW45Qow" role="2OqNvi">
-                <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
-                <node concept="2OqwBi" id="7mIqwW45Qox" role="DUT31">
-                  <node concept="2OqwBi" id="7mIqwW45Qoy" role="2Oq$k0">
-                    <node concept="37vLTw" id="7mIqwW45Qoz" role="2Oq$k0">
-                      <ref role="3cqZAo" node="7mIqwW45Qoj" resolve="qs" />
-                    </node>
-                    <node concept="1uHKPH" id="7mIqwW45Qo$" role="2OqNvi" />
-                  </node>
-                  <node concept="I4A8Y" id="7mIqwW45Qo_" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
           </node>
         </node>
         <node concept="3clFbJ" id="7mIqwW45QoA" role="3cqZAp">
@@ -565,9 +597,36 @@
             </node>
           </node>
           <node concept="3clFbC" id="7mIqwW45QoL" role="3clFbw">
-            <node concept="10Nm6u" id="7mIqwW45QoM" role="3uHU7w" />
             <node concept="37vLTw" id="7mIqwW45QoN" role="3uHU7B">
-              <ref role="3cqZAo" node="7mIqwW45Qos" resolve="mt" />
+              <ref role="3cqZAo" node="1ZdxAP9y8QL" resolve="qsmodel" />
+            </node>
+            <node concept="2OqwBi" id="1ZdxAP9y9z0" role="3uHU7w">
+              <node concept="37vLTw" id="1ZdxAP9y9z1" role="2Oq$k0">
+                <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+              </node>
+              <node concept="1st3f0" id="1ZdxAP9y9z2" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="1ZdxAP9y9ST" role="9aQIa">
+            <node concept="3clFbS" id="1ZdxAP9y9SU" role="9aQI4">
+              <node concept="3clFbF" id="1ZdxAP9y9JQ" role="3cqZAp">
+                <node concept="37vLTI" id="1ZdxAP9y9JS" role="3clFbG">
+                  <node concept="2OqwBi" id="7mIqwW45Qou" role="37vLTx">
+                    <node concept="37vLTw" id="7mIqwW45Qov" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7mIqwW45Qod" resolve="gencontext" />
+                    </node>
+                    <node concept="1iwH7d" id="7mIqwW45Qow" role="2OqNvi">
+                      <ref role="1iwH7c" to="osbg:4qGA5WCFyqy" resolve="expectType" />
+                      <node concept="37vLTw" id="1ZdxAP9y8QR" role="DUT31">
+                        <ref role="3cqZAo" node="1ZdxAP9y8QL" resolve="qsmodel" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1ZdxAP9y9JW" role="37vLTJ">
+                    <ref role="3cqZAo" node="7mIqwW45Qos" resolve="mt" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>