diff --git a/build.xml b/build.xml
index c7f908c0..13c4c53e 100644
--- a/build.xml
+++ b/build.xml
@@ -780,6 +780,7 @@
           <module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
           <module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" />
           <module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" />
+          <module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" />
           <module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
           <module ref="8fe4c62a-2020-4ff4-8eda-f322a55bdc9f(jetbrains.mps.refactoring.runtime)" />
           <module ref="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" />
@@ -2767,7 +2768,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.reporting.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.reporting.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2792,11 +2793,27 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.reporting.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2806,8 +2823,10 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -2816,11 +2835,12 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.reporting.runtime, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typechecking#01" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.lang.coderules, java.compile.jetbrains.mps.lang.coderules#4578927328670739933, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.typechecking, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.reporting.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
     <mkdir dir="${mps.macro.coderules_home}/coderules/languages/jetbrains.mps.lang.typechecking/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking#01" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2845,15 +2865,23 @@
         <fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
         <fileset file="${artifacts.mps}/lib/mps-platform.jar" />
         <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules#4578927328670739933" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodel.types" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.reporting.runtime" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
@@ -2871,6 +2899,7 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
@@ -3617,13 +3646,11 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
@@ -3633,7 +3660,6 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
       </classpath>
     </javac>
   </target>
@@ -3693,16 +3719,13 @@
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
-        <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections-generator.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
         <fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
-        <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor-generator.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
@@ -4020,6 +4043,7 @@
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.coderules.template.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.typechecking.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.jar" />
       <pathelement location="${build.layout}/deploy/jetbrains.mps.logic.reactor.jar" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index 85fd7f8c..085d6527 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -13968,356 +13968,6 @@
       <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
       <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
     </node>
-    <node concept="3aamgX" id="oI9YrdoXe" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="1Koe21" id="oI9YrdoXi" role="1lVwrX">
-        <node concept="3clFb_" id="oI9YrdoXo" role="1Koe22">
-          <property role="TrG5h" value="context" />
-          <node concept="3Tm6S6" id="oI9YrdoXy" role="1B3o_S" />
-          <node concept="3cqZAl" id="oI9YrdoXG" role="3clF45" />
-          <node concept="3clFbS" id="oI9YrdoYk" role="3clF47">
-            <node concept="3clFbF" id="oI9Yrdp0J" role="3cqZAp">
-              <node concept="2OqwBi" id="oI9YrdpxT" role="3clFbG">
-                <node concept="1eOMI4" id="oI9Yrdpd1" role="2Oq$k0">
-                  <node concept="10QFUN" id="oI9YrdpcY" role="1eOMHV">
-                    <node concept="3uibUv" id="oI9YrdpgP" role="10QFUM">
-                      <ref role="3uigEE" to="1g4i:7lt0LtQ_OIS" resolve="TypecheckingSessionSolver" />
-                    </node>
-                    <node concept="2OqwBi" id="oI9Yrdpd3" role="10QFUP">
-                      <node concept="2YIFZM" id="oI9Yrdpd4" role="2Oq$k0">
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                      </node>
-                      <node concept="liA8E" id="oI9Yrdpd5" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="oI9YrdpMV" role="2OqNvi">
-                  <ref role="37wK5l" to="1g4i:7lt0LtQ_SZU" resolve="assignType" />
-                  <node concept="10Nm6u" id="oI9YrdpSj" role="37wK5m">
-                    <node concept="29HgVG" id="oI9Yrdq5a" role="lGtFl">
-                      <node concept="3NFfHV" id="oI9Yrdq6g" role="3NFExx">
-                        <node concept="3clFbS" id="oI9Yrdq6h" role="2VODD2">
-                          <node concept="3clFbF" id="oI9Yrdqga" role="3cqZAp">
-                            <node concept="2OqwBi" id="oI9YrDiN5" role="3clFbG">
-                              <node concept="1PxgMI" id="oI9YrDis6" role="2Oq$k0">
-                                <property role="1BlNFB" value="true" />
-                                <node concept="chp4Y" id="oI9YrDiyk" role="3oSUPX">
-                                  <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                </node>
-                                <node concept="2OqwBi" id="oI9YrdqqW" role="1m5AlR">
-                                  <node concept="30H73N" id="oI9Yrdqg9" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="oI9YrhRpO" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="oI9YrDjih" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="10Nm6u" id="oI9YrdpWG" role="37wK5m">
-                    <node concept="29HgVG" id="oI9YrdqWM" role="lGtFl">
-                      <node concept="3NFfHV" id="oI9Yrdr5Y" role="3NFExx">
-                        <node concept="3clFbS" id="oI9Yrdr5Z" role="2VODD2">
-                          <node concept="3clFbF" id="oI9Yrdrm8" role="3cqZAp">
-                            <node concept="2OqwBi" id="oI9YrdrAN" role="3clFbG">
-                              <node concept="1PxgMI" id="oI9YrhSPv" role="2Oq$k0">
-                                <node concept="chp4Y" id="oI9YrhSWB" role="3oSUPX">
-                                  <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                </node>
-                                <node concept="2OqwBi" id="oI9YrhRJa" role="1m5AlR">
-                                  <node concept="30H73N" id="oI9Yrdrm7" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="oI9YrhSca" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3TrEf2" id="oI9YrhTh$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="raruj" id="oI9Yrdq3d" role="lGtFl" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="oI9YrhOAg" role="30HLyM">
-        <node concept="3clFbS" id="oI9YrhOAh" role="2VODD2">
-          <node concept="3clFbF" id="oI9YrhOQs" role="3cqZAp">
-            <node concept="2OqwBi" id="oI9YrhPLM" role="3clFbG">
-              <node concept="2OqwBi" id="oI9YrhP4Z" role="2Oq$k0">
-                <node concept="30H73N" id="oI9YrhOQr" role="2Oq$k0" />
-                <node concept="3TrEf2" id="oI9YrhPmb" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="oI9YrhQ9K" role="2OqNvi">
-                <node concept="chp4Y" id="oI9YrhQl5" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="3aamgX" id="oI9YrWegi" role="3acgRq">
-      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
-      <node concept="14YyZ8" id="oI9YrWeEj" role="1lVwrX">
-        <node concept="14ZrTv" id="oI9YrWeRH" role="14ZwWg">
-          <node concept="30G5F_" id="oI9YrWeRI" role="150hEN">
-            <node concept="3clFbS" id="oI9YrWeRJ" role="2VODD2">
-              <node concept="3clFbF" id="oI9YrWgo$" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9YrWhEN" role="3clFbG">
-                  <node concept="2OqwBi" id="oI9YrWgB7" role="2Oq$k0">
-                    <node concept="2Xjw5R" id="oI9YrWh21" role="2OqNvi">
-                      <node concept="3gmYPX" id="oI9YrWhba" role="1xVPHs">
-                        <node concept="3gn64h" id="oI9YrWhnj" role="3gmYPZ">
-                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="oI9Ys7DNw" role="2Oq$k0">
-                      <node concept="1iwH7S" id="oI9Ys7DNx" role="2Oq$k0" />
-                      <node concept="12$id9" id="oI9Ys7DNy" role="2OqNvi">
-                        <node concept="30H73N" id="oI9Ys7DNz" role="12$y8L" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3x8VRR" id="oI9YrWi3M" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="1Koe21" id="oI9YrWf2l" role="150oIE">
-            <node concept="3clFb_" id="oI9YrWf2m" role="1Koe22">
-              <property role="TrG5h" value="context" />
-              <node concept="3Tm6S6" id="oI9YrWf2n" role="1B3o_S" />
-              <node concept="3cqZAl" id="oI9YrWf2o" role="3clF45" />
-              <node concept="3clFbS" id="oI9YrWf2p" role="3clF47">
-                <node concept="3clFbF" id="oI9YrWf2q" role="3cqZAp">
-                  <node concept="2OqwBi" id="oI9YrWf2r" role="3clFbG">
-                    <node concept="2YIFZM" id="oI9YrWfNN" role="2Oq$k0">
-                      <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
-                      <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                      <node concept="2OqwBi" id="oI9YrWf2v" role="37wK5m">
-                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
-                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
-                        </node>
-                        <node concept="liA8E" id="oI9YrWf2x" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="oI9YrWf2y" role="2OqNvi">
-                      <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
-                      <node concept="10Nm6u" id="oI9YrWf2z" role="37wK5m">
-                        <node concept="29HgVG" id="oI9YrWf2$" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9YrWf2_" role="3NFExx">
-                            <node concept="3clFbS" id="oI9YrWf2A" role="2VODD2">
-                              <node concept="3clFbF" id="oI9YrWf2B" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9YrWf2C" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9YrWf2D" role="2Oq$k0">
-                                    <property role="1BlNFB" value="true" />
-                                    <node concept="chp4Y" id="oI9YrWf2E" role="3oSUPX">
-                                      <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9YrWf2F" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9YrWf2G" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9YrWf2H" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="oI9YrWf2I" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="10Nm6u" id="oI9YrWf2J" role="37wK5m">
-                        <node concept="29HgVG" id="oI9YrWf2K" role="lGtFl">
-                          <node concept="3NFfHV" id="oI9YrWf2L" role="3NFExx">
-                            <node concept="3clFbS" id="oI9YrWf2M" role="2VODD2">
-                              <node concept="3clFbF" id="oI9YrWf2N" role="3cqZAp">
-                                <node concept="2OqwBi" id="oI9YrWf2O" role="3clFbG">
-                                  <node concept="1PxgMI" id="oI9YrWf2P" role="2Oq$k0">
-                                    <node concept="chp4Y" id="oI9YrWf2Q" role="3oSUPX">
-                                      <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                    </node>
-                                    <node concept="2OqwBi" id="oI9YrWf2R" role="1m5AlR">
-                                      <node concept="30H73N" id="oI9YrWf2S" role="2Oq$k0" />
-                                      <node concept="3TrEf2" id="oI9YrWf2T" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3TrEf2" id="oI9YrWf2U" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="raruj" id="oI9YrWf2V" role="lGtFl" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1Koe21" id="oI9YrWidk" role="14YRTM">
-          <node concept="3clFb_" id="oI9YrWidl" role="1Koe22">
-            <property role="TrG5h" value="context" />
-            <node concept="37vLTG" id="oI9YrWqaC" role="3clF46">
-              <property role="TrG5h" value="session" />
-              <node concept="3uibUv" id="oI9YrWqaD" role="1tU5fm">
-                <ref role="3uigEE" to="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
-              </node>
-            </node>
-            <node concept="3Tm6S6" id="oI9YrWidm" role="1B3o_S" />
-            <node concept="3cqZAl" id="oI9YrWidn" role="3clF45" />
-            <node concept="3clFbS" id="oI9YrWido" role="3clF47">
-              <node concept="3clFbF" id="oI9YrWidp" role="3cqZAp">
-                <node concept="2OqwBi" id="oI9YrWidq" role="3clFbG">
-                  <node concept="2YIFZM" id="oI9YrWiD0" role="2Oq$k0">
-                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
-                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
-                    <node concept="37vLTw" id="oI9YrWqx1" role="37wK5m">
-                      <ref role="3cqZAo" node="oI9YrWqaC" resolve="session" />
-                      <node concept="1ZhdrF" id="oI9YrWqGh" role="lGtFl">
-                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
-                        <property role="2qtEX8" value="variableDeclaration" />
-                        <node concept="3$xsQk" id="oI9YrWqGi" role="3$ytzL">
-                          <node concept="3clFbS" id="oI9YrWqGj" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWsWU" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWsWV" role="3clFbG">
-                                <node concept="1iwH7S" id="oI9YrWsWW" role="2Oq$k0" />
-                                <node concept="1iwH70" id="oI9YrWsWX" role="2OqNvi">
-                                  <ref role="1iwH77" node="429xoypVg6q" resolve="apply_session_parameter" />
-                                  <node concept="2OqwBi" id="oI9YrWsWY" role="1iwH7V">
-                                    <node concept="30H73N" id="oI9YrWsWZ" role="2Oq$k0" />
-                                    <node concept="2Xjw5R" id="oI9YrWsX0" role="2OqNvi">
-                                      <node concept="1xMEDy" id="oI9YrWsX1" role="1xVPHs">
-                                        <node concept="chp4Y" id="oI9YrWsX2" role="ri$Ld">
-                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="oI9YrWidv" role="2OqNvi">
-                    <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
-                    <node concept="10Nm6u" id="oI9YrWidw" role="37wK5m">
-                      <node concept="29HgVG" id="oI9YrWidx" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9YrWidy" role="3NFExx">
-                          <node concept="3clFbS" id="oI9YrWidz" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWid$" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWid_" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9YrWidA" role="2Oq$k0">
-                                  <property role="1BlNFB" value="true" />
-                                  <node concept="chp4Y" id="oI9YrWidB" role="3oSUPX">
-                                    <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9YrWidC" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9YrWidD" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9YrWidE" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="oI9YrWidF" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="10Nm6u" id="oI9YrWidG" role="37wK5m">
-                      <node concept="29HgVG" id="oI9YrWidH" role="lGtFl">
-                        <node concept="3NFfHV" id="oI9YrWidI" role="3NFExx">
-                          <node concept="3clFbS" id="oI9YrWidJ" role="2VODD2">
-                            <node concept="3clFbF" id="oI9YrWidK" role="3cqZAp">
-                              <node concept="2OqwBi" id="oI9YrWidL" role="3clFbG">
-                                <node concept="1PxgMI" id="oI9YrWidM" role="2Oq$k0">
-                                  <node concept="chp4Y" id="oI9YrWidN" role="3oSUPX">
-                                    <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                                  </node>
-                                  <node concept="2OqwBi" id="oI9YrWidO" role="1m5AlR">
-                                    <node concept="30H73N" id="oI9YrWidP" role="2Oq$k0" />
-                                    <node concept="3TrEf2" id="oI9YrWidQ" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3TrEf2" id="oI9YrWidR" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="raruj" id="oI9YrWidS" role="lGtFl" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="oI9YrWegU" role="30HLyM">
-        <node concept="3clFbS" id="oI9YrWegV" role="2VODD2">
-          <node concept="3clFbF" id="oI9YrWegW" role="3cqZAp">
-            <node concept="2OqwBi" id="oI9YrWegX" role="3clFbG">
-              <node concept="2OqwBi" id="oI9YrWegY" role="2Oq$k0">
-                <node concept="30H73N" id="oI9YrWegZ" role="2Oq$k0" />
-                <node concept="3TrEf2" id="oI9YrWeh0" role="2OqNvi">
-                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="oI9YrWeh1" role="2OqNvi">
-                <node concept="chp4Y" id="oI9YrWeh2" role="cj9EA">
-                  <ref role="cht4Q" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="3aamgX" id="oI9Ys2xi_" role="3acgRq">
       <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
       <node concept="14YyZ8" id="oI9Ys2xiA" role="1lVwrX">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 3f0ab47f..af2a70c0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1446,29 +1446,6 @@
       </node>
     </node>
   </node>
-  <node concept="13h7C7" id="oI9Yrc9CS">
-    <ref role="13h7C2" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="13hLZK" id="oI9Yrc9CT" role="13h7CW">
-      <node concept="3clFbS" id="oI9Yrc9CU" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="oI9Yrc9Fs" role="13h7CS">
-      <property role="2Ki8OM" value="true" />
-      <property role="13i0is" value="false" />
-      <property role="TrG5h" value="applicableToNode" />
-      <property role="13i0it" value="false" />
-      <property role="13i0iv" value="false" />
-      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
-      <node concept="3Tm1VV" id="oI9Yrc9Ft" role="1B3o_S" />
-      <node concept="3clFbS" id="oI9Yrc9Fy" role="3clF47">
-        <node concept="3clFbF" id="oI9Yrc9L5" role="3cqZAp">
-          <node concept="3clFbT" id="oI9Yrc9L4" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-      <node concept="10P_77" id="oI9Yrc9Fz" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="oI9Ys1Qb1">
     <ref role="13h7C2" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
     <node concept="13hLZK" id="oI9Ys1Qb2" role="13h7CW">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 1bb8a518..33aa1e3b 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -746,23 +746,6 @@
       </node>
     </node>
   </node>
-  <node concept="1M2fIO" id="oI9Yr_Dyq">
-    <ref role="1M2myG" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="9S07l" id="oI9Yr_Dyr" role="9Vyp8">
-      <node concept="3clFbS" id="oI9Yr_Dys" role="2VODD2">
-        <node concept="3SKdUt" id="3IIf9O_Dsc2" role="3cqZAp">
-          <node concept="3SKdUq" id="3IIf9O_Dsc3" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: better control over where this should be available" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_DsqD" role="3cqZAp">
-          <node concept="3clFbT" id="3IIf9O_DsqC" role="3clFbG">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1M2fIO" id="1090FxOSDK0">
     <ref role="1M2myG" to="wq2x:60zk4o7reud" resolve="LogicalContextExpression" />
     <node concept="9S07l" id="1090FxOSDK1" role="9Vyp8">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 7379e90e..5143a232 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4391,26 +4391,6 @@
       </node>
     </node>
   </node>
-  <node concept="24kQdi" id="oI9Yrc9_k">
-    <ref role="1XX52x" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    <node concept="3EZMnI" id="oI9Yrc9BJ" role="2wV5jI">
-      <node concept="PMmxH" id="oI9Yrc9BQ" role="3EZMnx">
-        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
-      </node>
-      <node concept="3F0ifn" id="oI9Yrc9BZ" role="3EZMnx">
-        <property role="3F0ifm" value="(" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
-      <node concept="3F1sOY" id="oI9Yrc9Cp" role="3EZMnx">
-        <ref role="1NtTu8" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
-      </node>
-      <node concept="3F0ifn" id="oI9Yrc9C7" role="3EZMnx">
-        <property role="3F0ifm" value=")" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
-      </node>
-      <node concept="l2Vlx" id="oI9Yrc9BM" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="oI9Ys1lFq">
     <ref role="1XX52x" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
     <node concept="3EZMnI" id="oI9Ys1lGg" role="2wV5jI">
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 198fbce6..81b7ee27 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1086,20 +1086,6 @@
       <ref role="PrY4T" to="5j4j:7E86$tK$Rgo" resolve="LogicalVariableScope" />
     </node>
   </node>
-  <node concept="1TIwiD" id="oI9Yrc9wC">
-    <property role="EcuMT" value="6958395084019752" />
-    <property role="TrG5h" value="SNodeSetTypeOperation" />
-    <property role="34LRSv" value="set" />
-    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
-    <node concept="1TJgyj" id="oI9Yrc9Ch" role="1TKVEi">
-      <property role="IQ2ns" value="6958395084020241" />
-      <property role="20lmBu" value="aggregation" />
-      <property role="20kJfa" value="typeExpr" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
-    </node>
-    <node concept="asaX9" id="78H58oeu2G7" role="lGtFl" />
-  </node>
   <node concept="1TIwiD" id="oI9Ys1jH2">
     <property role="EcuMT" value="6958395097955138" />
     <property role="TrG5h" value="SNodeReportOperation" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index faa596e4..d94bbda2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -1446,48 +1446,6 @@
       <ref role="1YaFvo" to="wq2x:36tQV5BDmft" resolve="RequireStatement" />
     </node>
   </node>
-  <node concept="1YbPZF" id="oI9Yrc9SS">
-    <property role="TrG5h" value="typeof_SNodeAssignTypeOperation" />
-    <node concept="3clFbS" id="oI9Yrc9ST" role="18ibNy">
-      <node concept="1Z5TYs" id="oI9Yrca4p" role="3cqZAp">
-        <node concept="mw_s8" id="oI9Yrca4H" role="1ZfhKB">
-          <node concept="2c44tf" id="oI9Yrca4D" role="mwGJk">
-            <node concept="10P_77" id="oI9Yrca5G" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="oI9Yrca4s" role="1ZfhK$">
-          <node concept="1Z2H0r" id="oI9Yrc9Vt" role="mwGJk">
-            <node concept="1YBJjd" id="oI9Yrc9Xf" role="1Z2MuG">
-              <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="1ZobV4" id="oI9YrcaYJ" role="3cqZAp">
-        <node concept="mw_s8" id="oI9YrcaZ_" role="1ZfhKB">
-          <node concept="2c44tf" id="oI9YrcaZx" role="mwGJk">
-            <node concept="3Tqbb2" id="oI9Yrcb3x" role="2c44tc" />
-          </node>
-        </node>
-        <node concept="mw_s8" id="oI9YrcaYM" role="1ZfhK$">
-          <node concept="1Z2H0r" id="oI9Yrca6M" role="mwGJk">
-            <node concept="2OqwBi" id="oI9YrcahM" role="1Z2MuG">
-              <node concept="1YBJjd" id="oI9Yrca8F" role="2Oq$k0">
-                <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
-              </node>
-              <node concept="3TrEf2" id="oI9Yrcat9" role="2OqNvi">
-                <ref role="3Tt5mk" to="wq2x:oI9Yrc9Ch" resolve="typeExpr" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="oI9Yrc9SV" role="1YuTPh">
-      <property role="TrG5h" value="ato" />
-      <ref role="1YaFvo" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="2BZXJecE0cj">
     <property role="TrG5h" value="typeof_Query" />
     <property role="3GE5qa" value="query" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index 31a922b2..5394cf89 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -24,6 +24,12 @@
     <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
     <import index="ba7m" ref="r:4c5ac278-3ad7-4902-ab86-6c60b350f168(jetbrains.mps.lang.aspect.generator.template.main@generator)" />
     <import index="u46i" ref="r:c2760840-3210-4ad4-9e64-a2dfd53620e1(jetbrains.mps.lang.typechecking.aspect)" />
+    <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
+    <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
+    <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
+    <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -31,6 +37,7 @@
         <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" />
@@ -41,7 +48,28 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
@@ -49,20 +77,41 @@
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <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" />
       </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
+      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
+        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
+      </concept>
+      <concept id="1202776937179" name="jetbrains.mps.lang.generator.structure.AbandonInput_RuleConsequence" flags="lg" index="b5Tf3" />
       <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
         <child id="1167088157977" name="createRootRule" index="2VS0gm" />
+        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
       </concept>
       <concept id="1168559333462" name="jetbrains.mps.lang.generator.structure.TemplateDeclarationReference" flags="ln" index="j$656" />
       <concept id="1112730859144" name="jetbrains.mps.lang.generator.structure.TemplateSwitch" flags="ig" index="jVnub">
         <reference id="1112820671508" name="modifiedSwitch" index="phYkn" />
         <child id="1167340453568" name="reductionMappingRule" index="3aUrZf" />
       </concept>
+      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
       <concept id="5005282049925926521" name="jetbrains.mps.lang.generator.structure.TemplateArgumentParameterExpression" flags="nn" index="v3LJS">
         <reference id="5005282049925926522" name="parameter" index="v3LJV" />
       </concept>
@@ -76,20 +125,37 @@
       </concept>
       <concept id="1167087518662" name="jetbrains.mps.lang.generator.structure.CreateRootRule_Condition" flags="in" index="2VP$b9" />
       <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
+      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
       <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
         <property id="1167272244852" name="applyToConceptInheritors" index="36QftV" />
         <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
         <child id="1167169362365" name="conditionFunction" index="30HLyM" />
       </concept>
+      <concept id="1195158154974" name="jetbrains.mps.lang.generator.structure.InlineSwitch_RuleConsequence" flags="lg" index="14YyZ8">
+        <child id="1195158241124" name="defaultConsequence" index="14YRTM" />
+        <child id="1195158408710" name="case" index="14ZwWg" />
+      </concept>
+      <concept id="1195158388553" name="jetbrains.mps.lang.generator.structure.InlineSwitch_Case" flags="ng" index="14ZrTv">
+        <child id="1195158608805" name="conditionFunction" index="150hEN" />
+        <child id="1195158637244" name="caseConsequence" index="150oIE" />
+      </concept>
       <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
         <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
       </concept>
       <concept id="982871510064032177" name="jetbrains.mps.lang.generator.structure.IParameterizedTemplate" flags="ng" index="1s_3nv">
         <child id="982871510064032342" name="parameter" index="1s_3oS" />
       </concept>
+      <concept id="1167770111131" name="jetbrains.mps.lang.generator.structure.ReferenceMacro_GetReferent" flags="in" index="3$xsQk" />
+      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
+        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
+      </concept>
       <concept id="1805153994415891174" name="jetbrains.mps.lang.generator.structure.TemplateParameterDeclaration" flags="ng" index="1N15co">
         <child id="1805153994415893199" name="type" index="1N15GL" />
       </concept>
+      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
+      <concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
+        <child id="1167770376702" name="referentFunction" index="3$ytzL" />
+      </concept>
     </language>
     <language id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage">
       <concept id="2030416617761226491" name="jetbrains.mps.lang.slanguage.structure.Model_IsAspectOperation" flags="nn" index="3zA4fs">
@@ -101,6 +167,13 @@
         <child id="1217890689512" name="userKey" index="2fWi3N" />
       </concept>
       <concept id="1217894033795" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_TransientObjectAccess" flags="nn" index="2g92yo" />
+      <concept id="1229477454423" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalCopiedInputByOutput" flags="nn" index="12$id9">
+        <child id="1229477520175" name="outputNode" index="12$y8L" />
+      </concept>
+      <concept id="1216860049627" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOutputByLabelAndInput" flags="nn" index="1iwH70">
+        <reference id="1216860049628" name="label" index="1iwH77" />
+        <child id="1216860049632" name="inputNode" index="1iwH7V" />
+      </concept>
       <concept id="1216860049635" name="jetbrains.mps.lang.generator.generationContext.structure.TemplateFunctionParameter_generationContext" flags="nn" index="1iwH7S" />
       <concept id="1217026863835" name="jetbrains.mps.lang.generator.generationContext.structure.GenerationContextOp_GetOriginalInputModel" flags="nn" index="1st3f0" />
     </language>
@@ -110,18 +183,53 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
+        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
+      </concept>
+      <concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
+        <child id="1144104376918" name="parameter" index="1xVPHs" />
+      </concept>
       <concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
         <child id="7400021826774799510" name="ref" index="2tJFKM" />
       </concept>
+      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
+        <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="1212008292747" name="jetbrains.mps.lang.smodel.structure.Model_GetLongNameOperation" flags="nn" index="LkI2h" />
+      <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
+      <concept id="1154546920561" name="jetbrains.mps.lang.smodel.structure.OperationParm_ConceptList" flags="ng" index="3gmYPX">
+        <child id="1154546920563" name="concept" index="3gmYPZ" />
+      </concept>
+      <concept id="1154546950173" name="jetbrains.mps.lang.smodel.structure.ConceptReference" flags="ng" index="3gn64h">
+        <reference id="1154546997487" name="concept" index="3gnhBz" />
+      </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
+      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
+      <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
+        <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
+      </concept>
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
       </concept>
+      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
+        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      </concept>
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="3364660638048049745" name="jetbrains.mps.lang.core.structure.LinkAttribute" flags="ng" index="A9Btn">
+        <property id="1757699476691236116" name="linkRole" index="2qtEX8" />
+        <property id="1341860900488019036" name="linkId" index="P3scX" />
       </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
@@ -214,5 +322,362 @@
       </node>
     </node>
   </node>
+  <node concept="bUwia" id="oI9YrdoXd">
+    <property role="TrG5h" value="reporting" />
+    <node concept="3aamgX" id="oI9YrDh3R" role="3acgRq">
+      <ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
+      <node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
+    </node>
+    <node concept="3aamgX" id="oI9YrdoXe" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="1Koe21" id="oI9YrdoXi" role="1lVwrX">
+        <node concept="3clFb_" id="oI9YrdoXo" role="1Koe22">
+          <property role="TrG5h" value="context" />
+          <node concept="3Tm6S6" id="oI9YrdoXy" role="1B3o_S" />
+          <node concept="3cqZAl" id="oI9YrdoXG" role="3clF45" />
+          <node concept="3clFbS" id="oI9YrdoYk" role="3clF47">
+            <node concept="3clFbF" id="oI9Yrdp0J" role="3cqZAp">
+              <node concept="2OqwBi" id="oI9YrdpxT" role="3clFbG">
+                <node concept="1eOMI4" id="oI9Yrdpd1" role="2Oq$k0">
+                  <node concept="10QFUN" id="oI9YrdpcY" role="1eOMHV">
+                    <node concept="3uibUv" id="oI9YrdpgP" role="10QFUM">
+                      <ref role="3uigEE" to="1g4i:7lt0LtQ_OIS" resolve="TypecheckingSessionSolver" />
+                    </node>
+                    <node concept="2OqwBi" id="oI9Yrdpd3" role="10QFUP">
+                      <node concept="2YIFZM" id="oI9Yrdpd4" role="2Oq$k0">
+                        <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                      </node>
+                      <node concept="liA8E" id="oI9Yrdpd5" role="2OqNvi">
+                        <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="oI9YrdpMV" role="2OqNvi">
+                  <ref role="37wK5l" to="1g4i:7lt0LtQ_SZU" resolve="assignType" />
+                  <node concept="10Nm6u" id="oI9YrdpSj" role="37wK5m">
+                    <node concept="29HgVG" id="oI9Yrdq5a" role="lGtFl">
+                      <node concept="3NFfHV" id="oI9Yrdq6g" role="3NFExx">
+                        <node concept="3clFbS" id="oI9Yrdq6h" role="2VODD2">
+                          <node concept="3clFbF" id="oI9Yrdqga" role="3cqZAp">
+                            <node concept="2OqwBi" id="oI9YrDiN5" role="3clFbG">
+                              <node concept="1PxgMI" id="oI9YrDis6" role="2Oq$k0">
+                                <property role="1BlNFB" value="true" />
+                                <node concept="chp4Y" id="oI9YrDiyk" role="3oSUPX">
+                                  <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                                </node>
+                                <node concept="2OqwBi" id="oI9YrdqqW" role="1m5AlR">
+                                  <node concept="30H73N" id="oI9Yrdqg9" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="oI9YrhRpO" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="oI9YrDjih" role="2OqNvi">
+                                <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="10Nm6u" id="oI9YrdpWG" role="37wK5m">
+                    <node concept="29HgVG" id="oI9YrdqWM" role="lGtFl">
+                      <node concept="3NFfHV" id="oI9Yrdr5Y" role="3NFExx">
+                        <node concept="3clFbS" id="oI9Yrdr5Z" role="2VODD2">
+                          <node concept="3clFbF" id="oI9Yrdrm8" role="3cqZAp">
+                            <node concept="2OqwBi" id="oI9YrdrAN" role="3clFbG">
+                              <node concept="1PxgMI" id="oI9YrhSPv" role="2Oq$k0">
+                                <node concept="chp4Y" id="oI9YrhSWB" role="3oSUPX">
+                                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                                </node>
+                                <node concept="2OqwBi" id="oI9YrhRJa" role="1m5AlR">
+                                  <node concept="30H73N" id="oI9Yrdrm7" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="oI9YrhSca" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3TrEf2" id="oI9YrhTh$" role="2OqNvi">
+                                <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="raruj" id="oI9Yrdq3d" role="lGtFl" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="oI9YrhOAg" role="30HLyM">
+        <node concept="3clFbS" id="oI9YrhOAh" role="2VODD2">
+          <node concept="3clFbF" id="oI9YrhOQs" role="3cqZAp">
+            <node concept="2OqwBi" id="oI9YrhPLM" role="3clFbG">
+              <node concept="2OqwBi" id="oI9YrhP4Z" role="2Oq$k0">
+                <node concept="30H73N" id="oI9YrhOQr" role="2Oq$k0" />
+                <node concept="3TrEf2" id="oI9YrhPmb" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="oI9YrhQ9K" role="2OqNvi">
+                <node concept="chp4Y" id="oI9YrhQl5" role="cj9EA">
+                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="oI9YrWegi" role="3acgRq">
+      <ref role="30HIoZ" to="tpee:hqOqwz4" resolve="DotExpression" />
+      <node concept="14YyZ8" id="oI9YrWeEj" role="1lVwrX">
+        <node concept="14ZrTv" id="oI9YrWeRH" role="14ZwWg">
+          <node concept="30G5F_" id="oI9YrWeRI" role="150hEN">
+            <node concept="3clFbS" id="oI9YrWeRJ" role="2VODD2">
+              <node concept="3clFbF" id="oI9YrWgo$" role="3cqZAp">
+                <node concept="2OqwBi" id="oI9YrWhEN" role="3clFbG">
+                  <node concept="2OqwBi" id="oI9YrWgB7" role="2Oq$k0">
+                    <node concept="2Xjw5R" id="oI9YrWh21" role="2OqNvi">
+                      <node concept="3gmYPX" id="oI9YrWhba" role="1xVPHs">
+                        <node concept="3gn64h" id="oI9YrWhnj" role="3gmYPZ">
+                          <ref role="3gnhBz" to="wq2x:36tQV5AmIsB" resolve="ConstraintRule" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="oI9Ys7DNw" role="2Oq$k0">
+                      <node concept="1iwH7S" id="oI9Ys7DNx" role="2Oq$k0" />
+                      <node concept="12$id9" id="oI9Ys7DNy" role="2OqNvi">
+                        <node concept="30H73N" id="oI9Ys7DNz" role="12$y8L" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3x8VRR" id="oI9YrWi3M" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Koe21" id="oI9YrWf2l" role="150oIE">
+            <node concept="3clFb_" id="oI9YrWf2m" role="1Koe22">
+              <property role="TrG5h" value="context" />
+              <node concept="3Tm6S6" id="oI9YrWf2n" role="1B3o_S" />
+              <node concept="3cqZAl" id="oI9YrWf2o" role="3clF45" />
+              <node concept="3clFbS" id="oI9YrWf2p" role="3clF47">
+                <node concept="3clFbF" id="oI9YrWf2q" role="3cqZAp">
+                  <node concept="2OqwBi" id="oI9YrWf2r" role="3clFbG">
+                    <node concept="2YIFZM" id="oI9YrWfNN" role="2Oq$k0">
+                      <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                      <ref role="37wK5l" to="9x2e:oI9YrIZUA" resolve="solver" />
+                      <node concept="2OqwBi" id="oI9YrWf2v" role="37wK5m">
+                        <node concept="2YIFZM" id="oI9YrWf2w" role="2Oq$k0">
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.current():jetbrains.mps.logic.reactor.evaluation.EvaluationSession" resolve="current" />
+                          <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
+                        </node>
+                        <node concept="liA8E" id="oI9YrWf2x" role="2OqNvi">
+                          <ref role="37wK5l" to="w7la:~EvaluationSession.sessionSolver():jetbrains.mps.logic.reactor.evaluation.SessionSolver" resolve="sessionSolver" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="oI9YrWf2y" role="2OqNvi">
+                      <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
+                      <node concept="10Nm6u" id="oI9YrWf2z" role="37wK5m">
+                        <node concept="29HgVG" id="oI9YrWf2$" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9YrWf2_" role="3NFExx">
+                            <node concept="3clFbS" id="oI9YrWf2A" role="2VODD2">
+                              <node concept="3clFbF" id="oI9YrWf2B" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9YrWf2C" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9YrWf2D" role="2Oq$k0">
+                                    <property role="1BlNFB" value="true" />
+                                    <node concept="chp4Y" id="oI9YrWf2E" role="3oSUPX">
+                                      <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9YrWf2F" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9YrWf2G" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9YrWf2H" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="oI9YrWf2I" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="10Nm6u" id="oI9YrWf2J" role="37wK5m">
+                        <node concept="29HgVG" id="oI9YrWf2K" role="lGtFl">
+                          <node concept="3NFfHV" id="oI9YrWf2L" role="3NFExx">
+                            <node concept="3clFbS" id="oI9YrWf2M" role="2VODD2">
+                              <node concept="3clFbF" id="oI9YrWf2N" role="3cqZAp">
+                                <node concept="2OqwBi" id="oI9YrWf2O" role="3clFbG">
+                                  <node concept="1PxgMI" id="oI9YrWf2P" role="2Oq$k0">
+                                    <node concept="chp4Y" id="oI9YrWf2Q" role="3oSUPX">
+                                      <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                                    </node>
+                                    <node concept="2OqwBi" id="oI9YrWf2R" role="1m5AlR">
+                                      <node concept="30H73N" id="oI9YrWf2S" role="2Oq$k0" />
+                                      <node concept="3TrEf2" id="oI9YrWf2T" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3TrEf2" id="oI9YrWf2U" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="raruj" id="oI9YrWf2V" role="lGtFl" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1Koe21" id="oI9YrWidk" role="14YRTM">
+          <node concept="3clFb_" id="oI9YrWidl" role="1Koe22">
+            <property role="TrG5h" value="context" />
+            <node concept="37vLTG" id="oI9YrWqaC" role="3clF46">
+              <property role="TrG5h" value="session" />
+              <node concept="3uibUv" id="oI9YrWqaD" role="1tU5fm">
+                <ref role="3uigEE" to="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
+              </node>
+            </node>
+            <node concept="3Tm6S6" id="oI9YrWidm" role="1B3o_S" />
+            <node concept="3cqZAl" id="oI9YrWidn" role="3clF45" />
+            <node concept="3clFbS" id="oI9YrWido" role="3clF47">
+              <node concept="3clFbF" id="oI9YrWidp" role="3cqZAp">
+                <node concept="2OqwBi" id="oI9YrWidq" role="3clFbG">
+                  <node concept="2YIFZM" id="oI9YrWiD0" role="2Oq$k0">
+                    <ref role="1Pybhc" to="9x2e:oI9YrIZTG" resolve="ReportingFrom" />
+                    <ref role="37wK5l" to="9x2e:oI9YrJ1oq" resolve="application" />
+                    <node concept="37vLTw" id="oI9YrWqx1" role="37wK5m">
+                      <ref role="3cqZAo" node="oI9YrWqaC" resolve="session" />
+                      <node concept="1ZhdrF" id="oI9YrWqGh" role="lGtFl">
+                        <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068498886296/1068581517664" />
+                        <property role="2qtEX8" value="variableDeclaration" />
+                        <node concept="3$xsQk" id="oI9YrWqGi" role="3$ytzL">
+                          <node concept="3clFbS" id="oI9YrWqGj" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWsWU" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWsWV" role="3clFbG">
+                                <node concept="1iwH7S" id="oI9YrWsWW" role="2Oq$k0" />
+                                <node concept="1iwH70" id="oI9YrWsWX" role="2OqNvi">
+                                  <ref role="1iwH77" to="ogv8:429xoypVg6q" resolve="apply_session_parameter" />
+                                  <node concept="2OqwBi" id="oI9YrWsWY" role="1iwH7V">
+                                    <node concept="30H73N" id="oI9YrWsWZ" role="2Oq$k0" />
+                                    <node concept="2Xjw5R" id="oI9YrWsX0" role="2OqNvi">
+                                      <node concept="1xMEDy" id="oI9YrWsX1" role="1xVPHs">
+                                        <node concept="chp4Y" id="oI9YrWsX2" role="ri$Ld">
+                                          <ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="oI9YrWidv" role="2OqNvi">
+                    <ref role="37wK5l" to="9x2e:oI9YrIZnU" resolve="assignType" />
+                    <node concept="10Nm6u" id="oI9YrWidw" role="37wK5m">
+                      <node concept="29HgVG" id="oI9YrWidx" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9YrWidy" role="3NFExx">
+                          <node concept="3clFbS" id="oI9YrWidz" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWid$" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWid_" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9YrWidA" role="2Oq$k0">
+                                  <property role="1BlNFB" value="true" />
+                                  <node concept="chp4Y" id="oI9YrWidB" role="3oSUPX">
+                                    <ref role="cht4Q" to="tpee:hqOqwz4" resolve="DotExpression" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9YrWidC" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9YrWidD" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9YrWidE" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="oI9YrWidF" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="10Nm6u" id="oI9YrWidG" role="37wK5m">
+                      <node concept="29HgVG" id="oI9YrWidH" role="lGtFl">
+                        <node concept="3NFfHV" id="oI9YrWidI" role="3NFExx">
+                          <node concept="3clFbS" id="oI9YrWidJ" role="2VODD2">
+                            <node concept="3clFbF" id="oI9YrWidK" role="3cqZAp">
+                              <node concept="2OqwBi" id="oI9YrWidL" role="3clFbG">
+                                <node concept="1PxgMI" id="oI9YrWidM" role="2Oq$k0">
+                                  <node concept="chp4Y" id="oI9YrWidN" role="3oSUPX">
+                                    <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                                  </node>
+                                  <node concept="2OqwBi" id="oI9YrWidO" role="1m5AlR">
+                                    <node concept="30H73N" id="oI9YrWidP" role="2Oq$k0" />
+                                    <node concept="3TrEf2" id="oI9YrWidQ" role="2OqNvi">
+                                      <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3TrEf2" id="oI9YrWidR" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="raruj" id="oI9YrWidS" role="lGtFl" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="30G5F_" id="oI9YrWegU" role="30HLyM">
+        <node concept="3clFbS" id="oI9YrWegV" role="2VODD2">
+          <node concept="3clFbF" id="oI9YrWegW" role="3cqZAp">
+            <node concept="2OqwBi" id="oI9YrWegX" role="3clFbG">
+              <node concept="2OqwBi" id="oI9YrWegY" role="2Oq$k0">
+                <node concept="30H73N" id="oI9YrWegZ" role="2Oq$k0" />
+                <node concept="3TrEf2" id="oI9YrWeh0" role="2OqNvi">
+                  <ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
+                </node>
+              </node>
+              <node concept="1mIQ4w" id="oI9YrWeh1" role="2OqNvi">
+                <node concept="chp4Y" id="oI9YrWeh2" role="cj9EA">
+                  <ref role="cht4Q" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index a7fd866e..c2dd8e3a 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -23,6 +23,12 @@
         <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
         <dependency reexport="false">f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)</dependency>
         <dependency reexport="false">f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)</dependency>
+        <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
+        <dependency reexport="false">cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)</dependency>
+        <dependency reexport="false">da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)</dependency>
+        <dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
+        <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
+        <dependency reexport="false">e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -53,8 +59,10 @@
         <module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
         <module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+        <module reference="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c(jetbrains.mps.coderules)" version="0" />
         <module reference="942985d5-7bcf-46ee-8b79-7b662eaebb4e(jetbrains.mps.dataform)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+        <module reference="e45a8b22-94f2-427f-b849-77f254c4eef5(jetbrains.mps.lang.aspect#3274906159125927726)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.coderules)" version="0" />
         <module reference="21d5540d-cd6b-44dd-b6ab-6835bf032803(jetbrains.mps.lang.coderules#4578927328670739933)" version="0" />
         <module reference="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" version="0" />
@@ -65,14 +73,17 @@
         <module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
         <module reference="86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)" version="0" />
         <module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
+        <module reference="cba985fe-1e96-4f16-9f8d-b07434405d4f(jetbrains.mps.lang.smodel.types)" version="0" />
         <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" version="0" />
         <module reference="685b46b0-fc2b-411e-954a-af0eeec1a29a(jetbrains.mps.lang.typechecking#01)" version="0" />
         <module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
+        <module reference="b19b2d23-1869-41e0-9ee6-8eaad9ffcd84(jetbrains.mps.lang.util.order#174635545557533742)" version="0" />
         <module reference="35320f26-77cb-4c55-be9f-a97a27770af1(jetbrains.mps.logic)" version="0" />
         <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
         <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
         <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
+        <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
       </dependencyVersions>
       <mapping-priorities>
         <mapping-priority-rule kind="strictly_together">
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
index 557fa662..858b8824 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/behavior.mps
@@ -3,9 +3,80 @@
   <persistence version="9" />
   <languages>
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+    <import index="tpeu" ref="r:00000000-0000-4000-0000-011c895902fa(jetbrains.mps.lang.smodel.behavior)" />
+  </imports>
+  <registry>
+    <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
+        <reference id="1225194240799" name="concept" index="13h7C2" />
+        <child id="1225194240805" name="method" index="13h7CS" />
+        <child id="1225194240801" name="constructor" index="13h7CW" />
+      </concept>
+      <concept id="1225194413805" name="jetbrains.mps.lang.behavior.structure.ConceptConstructorDeclaration" flags="in" index="13hLZK" />
+      <concept id="1225194472830" name="jetbrains.mps.lang.behavior.structure.ConceptMethodDeclaration" flags="ng" index="13i0hz">
+        <property id="5864038008284099149" name="isStatic" index="2Ki8OM" />
+        <property id="1225194472833" name="isPrivate" index="13i0is" />
+        <property id="1225194472832" name="isVirtual" index="13i0it" />
+        <property id="1225194472834" name="isAbstract" index="13i0iv" />
+        <reference id="1225194472831" name="overriddenMethod" index="13i0hy" />
+      </concept>
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="13h7C7" id="oI9Yrc9CS">
+    <ref role="13h7C2" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+    <node concept="13hLZK" id="oI9Yrc9CT" role="13h7CW">
+      <node concept="3clFbS" id="oI9Yrc9CU" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="oI9Yrc9Fs" role="13h7CS">
+      <property role="2Ki8OM" value="true" />
+      <property role="13i0is" value="false" />
+      <property role="TrG5h" value="applicableToNode" />
+      <property role="13i0it" value="false" />
+      <property role="13i0iv" value="false" />
+      <ref role="13i0hy" to="tpeu:1653mnvAgrs" resolve="applicableToNode" />
+      <node concept="3Tm1VV" id="oI9Yrc9Ft" role="1B3o_S" />
+      <node concept="3clFbS" id="oI9Yrc9Fy" role="3clF47">
+        <node concept="3clFbF" id="oI9Yrc9L5" role="3cqZAp">
+          <node concept="3clFbT" id="oI9Yrc9L4" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="10P_77" id="oI9Yrc9Fz" role="3clF45" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
index 5045fac9..a4851eec 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/constraints.mps
@@ -3,9 +3,57 @@
   <persistence version="9" />
   <languages>
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
+        <child id="1137022507850" name="body" index="2VODD2" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </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="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
+        <property id="6329021646629104958" name="text" index="3SKdUp" />
+      </concept>
+      <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
+        <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
+      </concept>
+    </language>
+    <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
+      <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
+      <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
+        <reference id="1213093996982" name="concept" index="1M2myG" />
+        <child id="6702802731807737306" name="canBeChild" index="9Vyp8" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1M2fIO" id="oI9Yr_Dyq">
+    <ref role="1M2myG" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+    <node concept="9S07l" id="oI9Yr_Dyr" role="9Vyp8">
+      <node concept="3clFbS" id="oI9Yr_Dys" role="2VODD2">
+        <node concept="3SKdUt" id="3IIf9O_Dsc2" role="3cqZAp">
+          <node concept="3SKdUq" id="3IIf9O_Dsc3" role="3SKWNk">
+            <property role="3SKdUp" value="FIXME: better control over where this should be available" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9O_DsqD" role="3cqZAp">
+          <node concept="3clFbT" id="3IIf9O_DsqC" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
index e4c2f291..cfd11652 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/editor.mps
@@ -5,7 +5,59 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="11" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" />
+    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
+      <concept id="1381004262292414836" name="jetbrains.mps.lang.editor.structure.ICellStyle" flags="ng" index="1k5N5V">
+        <reference id="1381004262292426837" name="parentStyleClass" index="1k5W1q" />
+      </concept>
+      <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
+      </concept>
+      <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
+        <child id="1106270802874" name="cellLayout" index="2iSdaV" />
+        <child id="1073389446424" name="childCellModel" index="3EZMnx" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="oI9Yrc9_k">
+    <ref role="1XX52x" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+    <node concept="3EZMnI" id="oI9Yrc9BJ" role="2wV5jI">
+      <node concept="PMmxH" id="oI9Yrc9BQ" role="3EZMnx">
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0ifn" id="oI9Yrc9BZ" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
+      </node>
+      <node concept="3F1sOY" id="oI9Yrc9Cp" role="3EZMnx">
+        <ref role="1NtTu8" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
+      </node>
+      <node concept="3F0ifn" id="oI9Yrc9C7" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      </node>
+      <node concept="l2Vlx" id="oI9Yrc9BM" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
index 17a84010..ce9a5f9f 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/structure.mps
@@ -5,7 +5,46 @@
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="6" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
+    <import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
+  </imports>
+  <registry>
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+        <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
+      </concept>
+      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
+      </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" />
+        <property id="1071599937831" name="metaClass" index="20lmBu" />
+        <property id="241647608299431140" name="linkId" index="IQ2ns" />
+        <reference id="1071599976176" name="target" index="20lvS9" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1TIwiD" id="oI9Yrc9wC">
+    <property role="EcuMT" value="6958395084019752" />
+    <property role="TrG5h" value="SNodeSetTypeOperation" />
+    <property role="34LRSv" value="set" />
+    <ref role="1TJDcQ" to="tp25:g$eCIIG" resolve="SNodeOperation" />
+    <node concept="1TJgyj" id="oI9Yrc9Ch" role="1TKVEi">
+      <property role="IQ2ns" value="6958395084020241" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="typeExpr" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index 1886c305..7512d64c 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -3,9 +3,110 @@
   <persistence version="9" />
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
-  <imports />
-  <registry />
+  <imports>
+    <import index="zfi7" ref="r:39840d4e-f61c-4452-88c5-75b1eb10e892(jetbrains.mps.lang.typechecking.structure)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <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="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+    </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="1196350785113" name="jetbrains.mps.lang.quotation.structure.Quotation" flags="nn" index="2c44tf">
+        <child id="1196350785114" name="quotedNode" index="2c44tc" />
+      </concept>
+    </language>
+    <language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
+      <concept id="1185788614172" name="jetbrains.mps.lang.typesystem.structure.NormalTypeClause" flags="ng" index="mw_s8">
+        <child id="1185788644032" name="normalType" index="mwGJk" />
+      </concept>
+      <concept id="1195213580585" name="jetbrains.mps.lang.typesystem.structure.AbstractCheckingRule" flags="ig" index="18hYwZ">
+        <child id="1195213635060" name="body" index="18ibNy" />
+      </concept>
+      <concept id="1174642788531" name="jetbrains.mps.lang.typesystem.structure.ConceptReference" flags="ig" index="1YaCAy">
+        <reference id="1174642800329" name="concept" index="1YaFvo" />
+      </concept>
+      <concept id="1174643105530" name="jetbrains.mps.lang.typesystem.structure.InferenceRule" flags="ig" index="1YbPZF" />
+      <concept id="1174648085619" name="jetbrains.mps.lang.typesystem.structure.AbstractRule" flags="ng" index="1YuPPy">
+        <child id="1174648101952" name="applicableNode" index="1YuTPh" />
+      </concept>
+      <concept id="1174650418652" name="jetbrains.mps.lang.typesystem.structure.ApplicableNodeReference" flags="nn" index="1YBJjd">
+        <reference id="1174650432090" name="applicableNode" index="1YBMHb" />
+      </concept>
+      <concept id="1174657487114" name="jetbrains.mps.lang.typesystem.structure.TypeOfExpression" flags="nn" index="1Z2H0r">
+        <child id="1174657509053" name="term" index="1Z2MuG" />
+      </concept>
+      <concept id="1174658326157" name="jetbrains.mps.lang.typesystem.structure.CreateEquationStatement" flags="nn" index="1Z5TYs" />
+      <concept id="1174660718586" name="jetbrains.mps.lang.typesystem.structure.AbstractEquationStatement" flags="nn" index="1Zf1VF">
+        <child id="1174660783413" name="leftExpression" index="1ZfhK$" />
+        <child id="1174660783414" name="rightExpression" index="1ZfhKB" />
+      </concept>
+      <concept id="1174663118805" name="jetbrains.mps.lang.typesystem.structure.CreateLessThanInequationStatement" flags="nn" index="1ZobV4" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
+        <reference id="1138056516764" name="link" index="3Tt5mk" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1YbPZF" id="oI9Yrc9SS">
+    <property role="TrG5h" value="typeof_SNodeAssignTypeOperation" />
+    <node concept="3clFbS" id="oI9Yrc9ST" role="18ibNy">
+      <node concept="1Z5TYs" id="oI9Yrca4p" role="3cqZAp">
+        <node concept="mw_s8" id="oI9Yrca4H" role="1ZfhKB">
+          <node concept="2c44tf" id="oI9Yrca4D" role="mwGJk">
+            <node concept="10P_77" id="oI9Yrca5G" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="oI9Yrca4s" role="1ZfhK$">
+          <node concept="1Z2H0r" id="oI9Yrc9Vt" role="mwGJk">
+            <node concept="1YBJjd" id="oI9Yrc9Xf" role="1Z2MuG">
+              <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="1ZobV4" id="oI9YrcaYJ" role="3cqZAp">
+        <node concept="mw_s8" id="oI9YrcaZ_" role="1ZfhKB">
+          <node concept="2c44tf" id="oI9YrcaZx" role="mwGJk">
+            <node concept="3Tqbb2" id="oI9Yrcb3x" role="2c44tc" />
+          </node>
+        </node>
+        <node concept="mw_s8" id="oI9YrcaYM" role="1ZfhK$">
+          <node concept="1Z2H0r" id="oI9Yrca6M" role="mwGJk">
+            <node concept="2OqwBi" id="oI9YrcahM" role="1Z2MuG">
+              <node concept="1YBJjd" id="oI9Yrca8F" role="2Oq$k0">
+                <ref role="1YBMHb" node="oI9Yrc9SV" resolve="ato" />
+              </node>
+              <node concept="3TrEf2" id="oI9Yrcat9" role="2OqNvi">
+                <ref role="3Tt5mk" to="zfi7:oI9Yrc9Ch" resolve="typeExpr" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="oI9Yrc9SV" role="1YuTPh">
+      <property role="TrG5h" value="ato" />
+      <ref role="1YaFvo" to="zfi7:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index 8dcafd71..b46a0804 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -8,6 +8,7 @@
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -180,6 +181,11 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
+      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="" index="2ra2ae" />
+      </concept>
+    </language>
     <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
       <concept id="7345257067587627589" name="jetbrains.mps.lang.smodel.types.structure.SNodeTypeOperation" flags="ng" index="2W$R8B" />
     </language>
@@ -203,9 +209,6 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="6958395084019752" name="jetbrains.mps.lang.coderules.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
-      </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />
diff --git a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index d8e9f30a..5dc18215 100644
--- a/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -821,6 +821,42 @@
               <ref role="3bR37D" node="NKt6yomVLS" resolve="jetbrains.mps.lang.typechecking.runtime" />
             </node>
           </node>
+          <node concept="1SiIV0" id="58VeaO3uZwO" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwP" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="58VeaO3uZwQ" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwR" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="58VeaO3uZwS" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwT" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="58VeaO3uZwU" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwV" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="58VeaO3uZwW" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwX" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="oI9YrJ7Rx" resolve="jetbrains.mps.reporting.runtime" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="58VeaO3uZwY" role="3bR37C">
+            <node concept="3bR9La" id="58VeaO3uZwZ" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="NKt6ynF2pv" role="3bR37C">
           <node concept="1Busua" id="NKt6ynF2pw" role="1SiIV1">
@@ -1670,16 +1706,6 @@
               <ref role="3bR37D" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
             </node>
           </node>
-          <node concept="1SiIV0" id="6fXjIfxguhs" role="3bR37C">
-            <node concept="3bR9La" id="6fXjIfxguhr" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:7YI57w6K0jH" resolve="jetbrains.mps.lang.descriptor#9020561928507175817" />
-            </node>
-          </node>
-          <node concept="1SiIV0" id="6fXjIfxguhu" role="3bR37C">
-            <node concept="3bR9La" id="6fXjIfxguht" role="1SiIV1">
-              <ref role="3bR37D" to="ffeo:6zkSwmUIjUj" resolve="jetbrains.mps.lang.aspect#3274906159125927726" />
-            </node>
-          </node>
           <node concept="1SiIV0" id="4t7Xo7inQpT" role="3bR37C">
             <node concept="3bR9La" id="4t7Xo7inQpU" role="1SiIV1">
               <property role="3bR36h" value="false" />
@@ -1698,12 +1724,6 @@
               <ref role="3bR37D" node="3u5wJtgiSM" resolve="jetbrains.mps.lang.smodel.types" />
             </node>
           </node>
-          <node concept="1SiIV0" id="5pIcDR7Cf0q" role="3bR37C">
-            <node concept="3bR9La" id="5pIcDR7Cf0r" role="1SiIV1">
-              <property role="3bR36h" value="false" />
-              <ref role="3bR37D" to="ffeo:7YI57w6K09t" resolve="jetbrains.mps.baseLanguage.collections#1151699677197" />
-            </node>
-          </node>
         </node>
         <node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
           <node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
diff --git a/samples/fitch/build.xml b/samples/fitch/build.xml
index 794266b4..04ac6dee 100644
--- a/samples/fitch/build.xml
+++ b/samples/fitch/build.xml
@@ -51,6 +51,7 @@
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
diff --git a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps b/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
index df569ac6..b0ecb8ab 100644
--- a/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
+++ b/samples/fitch/languages/jetbrains.mps.fitch/models/types.mps
@@ -6,6 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -67,6 +68,11 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
+      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="" index="2ra2ae" />
+      </concept>
+    </language>
     <language id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types">
       <concept id="7345257067587627589" name="jetbrains.mps.lang.smodel.types.structure.SNodeTypeOperation" flags="ng" index="2W$R8B" />
     </language>
@@ -81,9 +87,6 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="6958395084019752" name="jetbrains.mps.lang.coderules.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
-      </concept>
       <concept id="6958395097955138" name="jetbrains.mps.lang.coderules.structure.SNodeReportOperation" flags="ng" index="2s7oft">
         <property id="6958395097963305" name="kind" index="2s7ueQ" />
         <child id="6958395097963208" name="text" index="2s7u9n" />
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
index 6184709a..d4a14510 100644
--- a/samples/lambdacalc/build.xml
+++ b/samples/lambdacalc/build.xml
@@ -61,6 +61,7 @@
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.jar" />
       <library file="${artifacts.coderules}/deploy/jetbrains.mps.logic.reactor.jar" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index 56b4e1cd..a84d57fd 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -11,6 +11,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>
@@ -242,6 +243,11 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
+      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="" index="2ra2ae" />
+      </concept>
+    </language>
     <language id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="sample.lambdacalc">
       <concept id="3749787170939265030" name="sample.lambdacalc.structure.VarType" flags="ng" index="2BbKIm">
         <property id="3749787170939266901" name="name" index="2BbKN5" />
@@ -301,9 +307,6 @@
       <concept id="9035818301008609703" name="jetbrains.mps.lang.coderules.structure.QueryTemplate" flags="ng" index="2bWyPT">
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
-      <concept id="6958395084019752" name="jetbrains.mps.lang.coderules.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
-      </concept>
       <concept id="6958395097955138" name="jetbrains.mps.lang.coderules.structure.SNodeReportOperation" flags="ng" index="2s7oft">
         <property id="6958395097963305" name="kind" index="2s7ueQ" />
         <child id="6958395097963208" name="text" index="2s7u9n" />
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 79d0a6b9..2a762b67 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
@@ -523,6 +523,11 @@
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
+    <language id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking">
+      <concept id="6958395084019752" name="" flags="ng" index="2ra22R">
+        <child id="6958395084020241" name="" index="2ra2ae" />
+      </concept>
+    </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
@@ -636,9 +641,6 @@
         <child id="7871500063838282362" name="code" index="fHCRw" />
       </concept>
       <concept id="4992889260816483106" name="jetbrains.mps.lang.coderules.structure.Condition" flags="ng" index="cBwPQ" />
-      <concept id="6958395084019752" name="jetbrains.mps.lang.coderules.structure.SNodeSetTypeOperation" flags="ng" index="2ra22R">
-        <child id="6958395084020241" name="typeExpr" index="2ra2ae" />
-      </concept>
       <concept id="6691972578451976398" name="jetbrains.mps.lang.coderules.structure.RuleInputSpecification" flags="ng" index="2t___k">
         <reference id="6691972578451990912" name="applicableConcept" index="2t_S0q" />
         <child id="6691972578451986151" name="input" index="2t_VXX" />