From 2de4d697819503495a6197ab109acf254412dfaf Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 25 May 2018 16:05:49 +0200
Subject: [PATCH] Introduce QueryKind. Fix the kinds of typechecking queries.
 Avoid directly linking the queries in types aspect.

---
 .mps/modules.xml                              |    2 +-
 build.xml                                     |   32 +-
 .../jetbrains.mps.baseLanguageExt.mpl         |    2 +
 .../jetbrains.mps.baseLanguageExt.types.mps   |   17 +-
 .../jetbrains.mps.typechecking.testlang.mpl   |    6 +
 .../jetbrains.mps.typechecking.build.mps      |   20 +-
 ...jetbrains.mps.typechecking.sample.test.msd |    2 +
 .../jetbrains.mps.typechecking@tests.mps      |   26 +-
 .../models/ui.plugin.mps                      |   63 +-
 .../jetbrains.mps.typechecking.msd            |    2 +-
 .../models/jetbrains.mps.typechecking.mps     | 1237 +++++++++++++++++
 .../models/service.mps                        |  938 +------------
 .../generator/template/main@generator.mps     |    2 +-
 .../generator/template/main@generator.mps     |   37 +-
 .../jetbrains.mps.lang.typesystem2.mpl        |    4 +
 .../languageModels/editor.mps                 |   47 +-
 .../languageModels/plugin.mps                 |    5 +-
 .../languageModels/structure.mps              |    7 +
 .../languageModels/typesystem.mps             |   31 +
 ...brains.mps.lang.typesystem2.evaluation.mps |   83 ++
 .../jetbrains.mps.lang.typesystem2.rule.mps   |   15 +
 21 files changed, 1601 insertions(+), 977 deletions(-)
 create mode 100644 typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps

diff --git a/.mps/modules.xml b/.mps/modules.xml
index 19bab88f..737d9281 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -18,7 +18,7 @@
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.testlang.sandbox/jetbrains.mps.typechecking.testlang.sandbox.msd" folder="typechecking.test" />
       <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.ui/jetbrains.mps.typechecking.ui.msd" folder="typechecking.ui" />
-      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking" />
+      <modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd" folder="typechecking.service" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
       <modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
diff --git a/build.xml b/build.xml
index 799e0c43..938b520b 100644
--- a/build.xml
+++ b/build.xml
@@ -2017,7 +2017,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2047,6 +2047,9 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
@@ -2054,6 +2057,9 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2075,6 +2081,7 @@
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.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.scopes.runtime.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
@@ -2084,7 +2091,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.dataform, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2115,6 +2122,9 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
+        <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
@@ -2122,6 +2132,9 @@
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2141,6 +2154,7 @@
         <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" />
         <fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
       </classpath>
@@ -2575,7 +2589,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2598,18 +2612,24 @@
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
-        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
         <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.typechecking" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/trove4j-3.0.3.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.2.30.jar" />
         <fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.2.30.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/reactive-streams-1.0.0.final.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava-2.1.1.jar" />
+        <fileset file="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/lib/rxjava2-swing-0.2.1.jar" />
         <fileset file="${artifacts.mps}/lib/annotations.jar" />
         <fileset file="${artifacts.mps}/lib/log4j.jar" />
         <fileset file="${artifacts.mps}/lib/jdom.jar" />
@@ -2699,7 +2719,7 @@
     </javac>
   </target>
   
-  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
+  <target name="java.compile.jetbrains.mps.typechecking.sample.test" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, java.compile.jetbrains.mps.typechecking.sample, fetchDependencies">
     <mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.sample.test/source_gen" />
     <mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" />
     <javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.sample.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@@ -2720,6 +2740,7 @@
         <fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
         <fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
         <fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
         <fileset file="${artifacts.mps}/lib/mps-editor.jar" />
         <fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
@@ -2729,6 +2750,7 @@
         <fileset file="${artifacts.mps}/lib/mps-icons.jar" />
         <fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
+        <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.reporting" />
         <pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.sample" />
         <fileset file="${artifacts.mps}/lib/mps-test.jar" />
         <fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.util.jar" />
diff --git a/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 511e9880..ad2ab4d8 100644
--- a/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -13,6 +13,7 @@
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
     <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -60,6 +61,7 @@
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
     <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
diff --git a/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index e0105c1e..01bf515a 100644
--- a/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/typechecking/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -36,6 +36,7 @@
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
     <import index="psr6" ref="r:ce187d46-c94b-47d6-8d77-26aa6af239e8(jetbrains.mps.lang.typesystem2.macro)" />
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" implicit="true" />
   </imports>
   <registry>
@@ -128,6 +129,9 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534555686" name="jetbrains.mps.baseLanguage.structure.CharType" flags="in" index="10Pfzv" />
@@ -622,6 +626,7 @@
       </concept>
       <concept id="7871500063866331595" name="jetbrains.mps.lang.typesystem2.structure.Query" flags="ng" index="92CTh">
         <child id="7871500063866331596" name="queryStage" index="92CTm" />
+        <child id="3026409000513569515" name="queryKind" index="2_lZgo" />
       </concept>
       <concept id="6928531011217292466" name="jetbrains.mps.lang.typesystem2.structure.IsfreeVariableConstraint" flags="ng" index="2aLmEc" />
       <concept id="6928531011217258898" name="jetbrains.mps.lang.typesystem2.structure.LogicVariableConstraint" flags="ng" index="2aLIYG">
@@ -20154,7 +20159,7 @@
     </node>
   </node>
   <node concept="92CTh" id="6OXbTD$fto2">
-    <property role="TrG5h" value="typecheck" />
+    <property role="TrG5h" value="Typecheck" />
     <node concept="2bWyPT" id="6OXbTD$ftqj" role="92CTm">
       <property role="TrG5h" value="check" />
       <node concept="3clFbS" id="6OXbTD$ftqk" role="fHCRw">
@@ -20193,9 +20198,13 @@
         </node>
       </node>
     </node>
+    <node concept="10M0yZ" id="2BZXJecEQOM" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
   </node>
   <node concept="92CTh" id="6OXbTD$ftrf">
-    <property role="TrG5h" value="subtypeOf" />
+    <property role="TrG5h" value="SubtypeOf" />
     <node concept="2bWyPT" id="6OXbTD$fttw" role="92CTm">
       <property role="TrG5h" value="subtypeOf" />
       <node concept="3clFbS" id="6OXbTD$fttx" role="fHCRw">
@@ -20266,6 +20275,10 @@
         <node concept="3clFbH" id="6OXbTD$fttZ" role="3cqZAp" />
       </node>
     </node>
+    <node concept="10M0yZ" id="2BZXJecEQQ5" role="2_lZgo">
+      <ref role="3cqZAo" to="1g4i:4t7Xo7inO_s" resolve="SUBTYPE" />
+      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+    </node>
   </node>
 </model>
 
diff --git a/typechecking/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/typechecking/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index 348e4e05..ceee945a 100644
--- a/typechecking/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/typechecking/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -47,6 +47,7 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -95,6 +96,11 @@
     <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
     <module reference="3a1f0f04-b5e0-43be-884e-b856bfdeca21(jetbrains.mps.typechecking.testlang)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
index 2b4ada33..d3a980af 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
@@ -933,6 +933,18 @@
               <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" />
+              <ref role="3bR37D" to="ffeo:7Kfy9QB6L8Y" resolve="jetbrains.mps.lang.project" />
+            </node>
+          </node>
+          <node concept="1SiIV0" id="4t7Xo7i$jSj" role="3bR37C">
+            <node concept="3bR9La" id="4t7Xo7i$jSk" role="1SiIV1">
+              <property role="3bR36h" value="false" />
+              <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+            </node>
+          </node>
         </node>
         <node concept="1SiIV0" id="wfREvqj2G8" role="3bR37C">
           <node concept="3bR9La" id="wfREvqj2G9" role="1SiIV1">
@@ -1326,7 +1338,7 @@
         </node>
         <node concept="1SiIV0" id="65DJywFj294" role="3bR37C">
           <node concept="3bR9La" id="65DJywFj295" role="1SiIV1">
-            <property role="3bR36h" value="false" />
+            <property role="3bR36h" value="true" />
             <ref role="3bR37D" node="7BVjoXzUx9d" resolve="jetbrains.mps.lang.typesystem2.template" />
           </node>
         </node>
@@ -1733,6 +1745,12 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="4t7Xo7iJJJg" role="3bR37C">
+          <node concept="3bR9La" id="4t7Xo7iJJJh" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="46o4wsH5O3R" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
index 62ed16ce..0ef7a583 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking.sample.test/jetbrains.mps.typechecking.sample.test.msd
@@ -38,9 +38,11 @@
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
+    <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" 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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
+    <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
     <module reference="3ddddf69-9ff0-426b-9365-51ae7356fb82(jetbrains.mps.typechecking.sample)" version="0" />
     <module reference="1b65dfe8-24ff-41c3-9a3e-70f102942455(jetbrains.mps.typechecking.sample.test)" version="0" />
   </dependencyVersions>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
index 20dfed6f..f325d6e5 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
@@ -47,6 +47,7 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -843,9 +844,10 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="6OXbTD_oqun" role="2OqNvi">
-                      <ref role="37wK5l" to="hano:7WKNeR95RPZ" resolve="byFqName" />
-                      <node concept="Xl_RD" id="6d0cWF2SWTi" role="37wK5m">
-                        <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
+                      <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
+                      <node concept="10M0yZ" id="2BZXJecMAXy" role="37wK5m">
+                        <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+                        <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
                       </node>
                     </node>
                   </node>
@@ -1251,9 +1253,9 @@
                     <node concept="3cpWsn" id="6$7vuu2wZdr" role="3cpWs9">
                       <property role="TrG5h" value="typeOfExpr" />
                       <node concept="3Tqbb2" id="6$7vuu2wZdp" role="1tU5fm" />
-                      <node concept="2YIFZM" id="3IIf9O_uwHs" role="33vP2m">
-                        <ref role="37wK5l" to="tj24:3IIf9O_u0Ck" resolve="typeOf" />
-                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                      <node concept="2YIFZM" id="4t7Xo7iw4eI" role="33vP2m">
+                        <ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
+                        <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
                         <node concept="2OqwBi" id="14$_tTxxSAt" role="37wK5m">
                           <node concept="37vLTw" id="14$_tTxxSjJ" role="2Oq$k0">
                             <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
@@ -1282,9 +1284,9 @@
                     <node concept="3cpWsn" id="6$7vuu2xGoB" role="3cpWs9">
                       <property role="TrG5h" value="typeOfExpr2" />
                       <node concept="3Tqbb2" id="6$7vuu2xGoC" role="1tU5fm" />
-                      <node concept="2YIFZM" id="3IIf9O_uwVw" role="33vP2m">
-                        <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                        <ref role="37wK5l" to="tj24:3IIf9O_u0Ck" resolve="typeOf" />
+                      <node concept="2YIFZM" id="4t7Xo7iw4eJ" role="33vP2m">
+                        <ref role="37wK5l" to="1g4i:3IIf9O_u0Ck" resolve="typeOf" />
+                        <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
                         <node concept="2OqwBi" id="3IIf9O_uwVx" role="37wK5m">
                           <node concept="37vLTw" id="3IIf9O_uwVy" role="2Oq$k0">
                             <ref role="3cqZAo" node="14$_tTxxQ5i" resolve="varo" />
@@ -1622,9 +1624,9 @@
                       <node concept="3cpWsn" id="3IIf9OA557D" role="3cpWs9">
                         <property role="TrG5h" value="isSubtype" />
                         <node concept="10P_77" id="3IIf9OA557w" role="1tU5fm" />
-                        <node concept="2YIFZM" id="3IIf9OA557E" role="33vP2m">
-                          <ref role="37wK5l" to="tj24:3IIf9OA4ZMD" resolve="isSubtype" />
-                          <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                        <node concept="2YIFZM" id="4t7Xo7iw4eK" role="33vP2m">
+                          <ref role="37wK5l" to="1g4i:3IIf9OA4ZMD" resolve="isSubtype" />
+                          <ref role="1Pybhc" to="1g4i:7kaxm0sEy3e" resolve="TypecheckingFacade" />
                           <node concept="37vLTw" id="3IIf9OA557F" role="37wK5m">
                             <ref role="3cqZAo" node="3IIf9OA4zN5" resolve="typeOfExpr" />
                           </node>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 077d4431..4021a1b5 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -102,6 +102,7 @@
     <import index="bid0" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.util(jetbrains.mps.logic.reactor/)" />
     <import index="1ctc" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -30470,8 +30471,10 @@
     <node concept="2YIFZL" id="7WKNeR8SP2E" role="jymVt">
       <property role="TrG5h" value="launchQuery" />
       <node concept="37vLTG" id="7WKNeR9gygX" role="3clF46">
-        <property role="TrG5h" value="queryFqName" />
-        <node concept="17QB3L" id="7WKNeR9gy_k" role="1tU5fm" />
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="2Mi2iz0OnfF" role="1tU5fm">
+          <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
       </node>
       <node concept="37vLTG" id="7WKNeR8SP2H" role="3clF46">
         <property role="TrG5h" value="editorComponent" />
@@ -30501,7 +30504,7 @@
             <node concept="1pGfFk" id="7WKNeR8SP2S" role="2ShVmc">
               <ref role="37wK5l" node="7WKNeR8SQxi" resolve="TypecheckingActions.LaunchQuery" />
               <node concept="37vLTw" id="7WKNeR9gzZ3" role="37wK5m">
-                <ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryFqName" />
+                <ref role="3cqZAo" node="7WKNeR9gygX" resolve="queryKind" />
               </node>
               <node concept="37vLTw" id="7WKNeR8SP2U" role="37wK5m">
                 <ref role="3cqZAo" node="7WKNeR8SP2H" resolve="editorComponent" />
@@ -31525,8 +31528,10 @@
       <node concept="2tJIrI" id="7WKNeR8SQxh" role="jymVt" />
       <node concept="3clFbW" id="7WKNeR8SQxi" role="jymVt">
         <node concept="37vLTG" id="7WKNeR9ahrT" role="3clF46">
-          <property role="TrG5h" value="queryFqName" />
-          <node concept="17QB3L" id="7WKNeR9ahN6" role="1tU5fm" />
+          <property role="TrG5h" value="queryKind" />
+          <node concept="3uibUv" id="2Mi2iz0Onwr" role="1tU5fm">
+            <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+          </node>
         </node>
         <node concept="37vLTG" id="7WKNeR8SQxl" role="3clF46">
           <property role="TrG5h" value="editorComponent" />
@@ -31570,7 +31575,7 @@
                 </node>
               </node>
               <node concept="37vLTw" id="7WKNeR9fm7l" role="37vLTx">
-                <ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryFqName" />
+                <ref role="3cqZAo" node="7WKNeR9ahrT" resolve="queryKind" />
               </node>
             </node>
           </node>
@@ -31871,7 +31876,9 @@
       <node concept="312cEg" id="7WKNeR9fm7b" role="jymVt">
         <property role="TrG5h" value="queryFqName" />
         <node concept="3Tm6S6" id="7WKNeR9fm7c" role="1B3o_S" />
-        <node concept="17QB3L" id="7WKNeR9fm7e" role="1tU5fm" />
+        <node concept="3uibUv" id="2Mi2iz0OnNw" role="1tU5fm">
+          <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6hqFpWnfjsp" role="jymVt" />
@@ -33741,30 +33748,15 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7WKNeR8RdQu" role="3cqZAp" />
-        <node concept="3SKdUt" id="6OXbTD_AKjZ" role="3cqZAp">
-          <node concept="3SKdUq" id="6OXbTD_AKk1" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7WKNeR9hhkg" role="3cqZAp">
-          <node concept="3cpWsn" id="7WKNeR9hhkh" role="3cpWs9">
-            <property role="TrG5h" value="fqueryFqName" />
-            <node concept="17QB3L" id="7WKNeR9hhkf" role="1tU5fm" />
-            <node concept="Xl_RD" id="6d0cWF2SUMI" role="33vP2m">
-              <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6d0cWF2SWaM" role="3cqZAp" />
         <node concept="3clFbF" id="7WKNeR8RdQN" role="3cqZAp">
           <node concept="2OqwBi" id="7WKNeR8RdQO" role="3clFbG">
             <node concept="2OqwBi" id="7WKNeR8RdQP" role="2Oq$k0">
               <node concept="2YIFZM" id="7WKNeR8TaPY" role="2Oq$k0">
                 <ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
                 <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
-                <node concept="37vLTw" id="7WKNeR9hhkt" role="37wK5m">
-                  <ref role="3cqZAo" node="7WKNeR9hhkh" resolve="fqueryFqName" />
+                <node concept="10M0yZ" id="2Mi2iz0OoOv" role="37wK5m">
+                  <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+                  <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
                 </node>
                 <node concept="2OqwBi" id="7WKNeR8TaPZ" role="37wK5m">
                   <node concept="2WthIp" id="7WKNeR8TaQ0" role="2Oq$k0" />
@@ -33869,22 +33861,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3IIf9O_okkg" role="3cqZAp" />
-        <node concept="3SKdUt" id="6d0cWF2SWTd" role="3cqZAp">
-          <node concept="3SKdUq" id="6d0cWF2SWTe" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6d0cWF2SWTf" role="3cqZAp">
-          <node concept="3cpWsn" id="6d0cWF2SWTg" role="3cpWs9">
-            <property role="TrG5h" value="fqueryFqName" />
-            <node concept="17QB3L" id="6d0cWF2SWTh" role="1tU5fm" />
-            <node concept="Xl_RD" id="6d0cWF2SWTi" role="33vP2m">
-              <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_okkE" role="3cqZAp" />
         <node concept="3clFbF" id="3IIf9O_okkF" role="3cqZAp">
           <node concept="2OqwBi" id="3IIf9O_okkG" role="3clFbG">
             <node concept="2OqwBi" id="3IIf9O_oo3r" role="2Oq$k0">
@@ -33892,8 +33868,9 @@
                 <node concept="2YIFZM" id="3IIf9O_okkI" role="2Oq$k0">
                   <ref role="37wK5l" node="7WKNeR8SP2E" resolve="launchQuery" />
                   <ref role="1Pybhc" node="6hqFpWnf9Mu" resolve="TypecheckingActions" />
-                  <node concept="37vLTw" id="6d0cWF2SY5R" role="37wK5m">
-                    <ref role="3cqZAo" node="6d0cWF2SWTg" resolve="fqueryFqName" />
+                  <node concept="10M0yZ" id="2Mi2iz0OpPz" role="37wK5m">
+                    <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+                    <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
                   </node>
                   <node concept="2OqwBi" id="3IIf9O_okkK" role="37wK5m">
                     <node concept="2WthIp" id="3IIf9O_okkL" role="2Oq$k0" />
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd b/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
index 65e3f3c9..7a0509bd 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
+++ b/typechecking/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
@@ -22,7 +22,7 @@
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.typesystem2.runtime)</dependency>
     <dependency reexport="true">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
     <dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
-    <dependency reexport="false">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
+    <dependency reexport="true">ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)</dependency>
     <dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
     <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
new file mode 100644
index 00000000..2419dde1
--- /dev/null
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
@@ -0,0 +1,1237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="6" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
+    <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
+  </languages>
+  <imports>
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="qox2" ref="r:7ff0776c-aea4-4df2-88a3-2efb6b568dc3(jetbrains.mps.typechecking.plugin)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
+    <import index="unkn" ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d/java:io.reactivex(jetbrains.mps.typechecking/)" />
+    <import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.typesystem2.rule)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
+        <child id="1068498886297" name="rValue" index="37vLTx" />
+        <child id="1068498886295" name="lValue" index="37vLTJ" />
+      </concept>
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
+      <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="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
+        <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <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="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
+      <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
+        <child id="1164991057263" name="throwable" index="YScLw" />
+      </concept>
+      <concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
+        <child id="1081256993305" name="classType" index="2ZW6by" />
+        <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
+      </concept>
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <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="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <child id="1095933932569" name="implementedInterface" index="EKbjA" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <property id="1176718929932" name="isFinal" index="3TUv4t" />
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </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="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <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">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <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_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
+      <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1068580123160" name="condition" index="3clFbw" />
+        <child id="1068580123161" name="ifTrue" index="3clFbx" />
+      </concept>
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <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="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
+      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+        <child id="1109201940907" name="parameter" index="11_B2D" />
+      </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="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </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>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+    </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
+    <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
+        <child id="8465538089690331502" name="body" index="TZ5H$" />
+      </concept>
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
+        <child id="8970989240999019149" name="part" index="1dT_Ay" />
+      </concept>
+      <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
+        <property id="8970989240999019144" name="text" index="1dT_AB" />
+      </concept>
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
+      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+    </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">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
+        <child id="1151688676805" name="elementType" index="_ZDj9" />
+      </concept>
+      <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
+        <child id="1237721435808" name="initValue" index="HW$Y0" />
+        <child id="1237721435807" name="elementType" index="HW$YZ" />
+      </concept>
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
+      <concept id="1240424373525" name="jetbrains.mps.baseLanguage.collections.structure.MappingType" flags="in" index="3f3tKP">
+        <child id="1240424397093" name="keyType" index="3f3zw5" />
+        <child id="1240424402756" name="valueType" index="3f3$T$" />
+      </concept>
+      <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
+        <child id="1197683466920" name="keyType" index="3rvQeY" />
+        <child id="1197683475734" name="valueType" index="3rvSg0" />
+      </concept>
+      <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
+      <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
+      <concept id="1240854379201" name="jetbrains.mps.baseLanguage.collections.structure.MappingsSetOperation" flags="nn" index="3CFNJx" />
+    </language>
+  </registry>
+  <node concept="312cEu" id="7kaxm0sEy3e">
+    <property role="TrG5h" value="TypecheckingFacade" />
+    <node concept="2tJIrI" id="7kaxm0sEy44" role="jymVt" />
+    <node concept="2YIFZL" id="3IIf9O_u0Ck" role="jymVt">
+      <property role="TrG5h" value="typeOf" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7kaxm0sEBHw" role="3clF47">
+        <node concept="3clFbF" id="3IIf9O_u1a4" role="3cqZAp">
+          <node concept="2OqwBi" id="3IIf9O_u1Ig" role="3clFbG">
+            <node concept="2YIFZM" id="3IIf9O_Z9Gn" role="2Oq$k0">
+              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
+              <node concept="37vLTw" id="3IIf9O_Z9Go" role="37wK5m">
+                <ref role="3cqZAo" node="7kaxm0sEBL9" resolve="node" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3IIf9O_u1WZ" role="2OqNvi">
+              <ref role="37wK5l" node="3IIf9O_tkwF" resolve="getTypeOf" />
+              <node concept="37vLTw" id="3IIf9O_u2vc" role="37wK5m">
+                <ref role="3cqZAo" node="7kaxm0sEBL9" resolve="node" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7kaxm0sEBL9" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="7kaxm0sEBLY" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="7kaxm0sEBIE" role="3clF45" />
+      <node concept="P$JXv" id="7kaxm0sEBMI" role="lGtFl">
+        <node concept="TZ5HA" id="7kaxm0sEBMJ" role="TZ5H$">
+          <node concept="1dT_AC" id="7kaxm0sEBMK" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action." />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7kaxm0sEBHv" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="3IIf9O_tka_" role="jymVt" />
+    <node concept="2YIFZL" id="3IIf9OA4ZMD" role="jymVt">
+      <property role="TrG5h" value="isSubtype" />
+      <node concept="37vLTG" id="3IIf9OA507H" role="3clF46">
+        <property role="TrG5h" value="subtype" />
+        <node concept="3Tqbb2" id="3IIf9OA50cS" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3IIf9OA50dD" role="3clF46">
+        <property role="TrG5h" value="supertype" />
+        <node concept="3Tqbb2" id="3IIf9OA50gM" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="3IIf9OA4ZSv" role="3clF45" />
+      <node concept="3Tm1VV" id="3IIf9OA4ZMG" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9OA4ZMH" role="3clF47">
+        <node concept="YS8fn" id="3IIf9OA50t1" role="3cqZAp">
+          <node concept="2ShNRf" id="3IIf9OA50xX" role="YScLw">
+            <node concept="1pGfFk" id="3IIf9OA51iD" role="2ShVmc">
+              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="3IIf9OA51l$" role="lGtFl">
+        <node concept="TZ5HA" id="3IIf9OA51l_" role="TZ5H$">
+          <node concept="1dT_AC" id="3IIf9OA51lA" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3IIf9OA4Zhw" role="jymVt" />
+    <node concept="2YIFZL" id="3IIf9O_Z6Ip" role="jymVt">
+      <property role="TrG5h" value="forNode" />
+      <node concept="37vLTG" id="3IIf9O_Z79b" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3IIf9O_Z7fM" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="3IIf9O_Z77V" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
+      </node>
+      <node concept="3Tm1VV" id="3IIf9O_Z6Is" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9O_Z6It" role="3clF47">
+        <node concept="3clFbF" id="3IIf9O_Z8fP" role="3cqZAp">
+          <node concept="2ShNRf" id="3IIf9O_Z8fL" role="3clFbG">
+            <node concept="1pGfFk" id="3IIf9O_Z9pb" role="2ShVmc">
+              <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingFacade" />
+              <node concept="2YIFZM" id="3IIf9O_Z9Ao" role="37wK5m">
+                <ref role="37wK5l" node="3IIf9O_tL1f" resolve="repository" />
+                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
+                <node concept="37vLTw" id="3IIf9O_Z9Ap" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_Z79b" resolve="node" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="3IIf9O_Zcd$" role="lGtFl">
+        <node concept="TZ5HA" id="3IIf9O_Zcd_" role="TZ5H$">
+          <node concept="1dT_AC" id="3IIf9O_ZcdA" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3IIf9O_Z6oz" role="jymVt" />
+    <node concept="2YIFZL" id="3IIf9O_tL1f" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="3IIf9O_tJHw" role="3clF47">
+        <node concept="3cpWs8" id="3IIf9O_tJHx" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_tJHy" role="3cpWs9">
+            <property role="TrG5h" value="unit" />
+            <node concept="H_c77" id="3IIf9O_tJHz" role="1tU5fm" />
+            <node concept="2OqwBi" id="3IIf9O_tJH$" role="33vP2m">
+              <node concept="37vLTw" id="3IIf9O_tJH_" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_tJHs" resolve="node" />
+              </node>
+              <node concept="I4A8Y" id="3IIf9O_tJHA" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3IIf9O_tJHD" role="3cqZAp">
+          <node concept="3clFbS" id="3IIf9O_tJHE" role="3clFbx">
+            <node concept="3SKdUt" id="3IIf9O_tRYY" role="3cqZAp">
+              <node concept="3SKdUq" id="3IIf9O_tRZ0" role="3SKWNk">
+                <property role="3SKdUp" value="FIXME the default repository" />
+              </node>
+            </node>
+            <node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
+              <node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
+                <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
+          </node>
+          <node concept="3clFbC" id="3IIf9O_tJHH" role="3clFbw">
+            <node concept="10Nm6u" id="3IIf9O_tJHI" role="3uHU7w" />
+            <node concept="37vLTw" id="3IIf9O_tJHJ" role="3uHU7B">
+              <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9O_tJHK" role="3cqZAp">
+          <node concept="2OqwBi" id="3IIf9O_tJHL" role="3clFbG">
+            <node concept="2JrnkZ" id="3IIf9O_tJHM" role="2Oq$k0">
+              <node concept="37vLTw" id="3IIf9O_tJHN" role="2JrQYb">
+                <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
+              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="3IIf9O_tJHs" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3IIf9O_tJHt" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="3IIf9O_tJHu" role="3clF45">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+      <node concept="3Tm6S6" id="3IIf9O_tJHv" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="3IIf9O_Z7tT" role="jymVt" />
+    <node concept="3clFb_" id="3IIf9O_tkwF" role="jymVt">
+      <property role="TrG5h" value="getTypeOf" />
+      <node concept="37vLTG" id="3IIf9O_tkBA" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="3IIf9O_tmJD" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="3IIf9O_tlg1" role="3clF45" />
+      <node concept="3Tm1VV" id="3IIf9O_tkwI" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9O_tkwJ" role="3clF47">
+        <node concept="3SKdUt" id="3IIf9O_tnmk" role="3cqZAp">
+          <node concept="3SKdUq" id="3IIf9O_tnml" role="3SKWNk">
+            <property role="3SKdUp" value="ensure we can read the model" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9O_tnmm" role="3cqZAp">
+          <node concept="2OqwBi" id="3IIf9O_tnmn" role="3clFbG">
+            <node concept="2OqwBi" id="3IIf9O_tnmo" role="2Oq$k0">
+              <node concept="37vLTw" id="3IIf9O_tnmp" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="3IIf9O_tnmq" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3IIf9O_tnmr" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_tnms" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9O_tnmt" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_tnmu" role="3cpWs9">
+            <property role="TrG5h" value="containingRoot" />
+            <node concept="3Tqbb2" id="3IIf9O_tnmv" role="1tU5fm" />
+            <node concept="2OqwBi" id="3IIf9O_tnmw" role="33vP2m">
+              <node concept="37vLTw" id="3IIf9O_tnmx" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_tkBA" resolve="node" />
+              </node>
+              <node concept="2Rxl7S" id="3IIf9O_tnmy" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_tnmH" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9O_tnmI" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_tnmJ" role="3cpWs9">
+            <property role="TrG5h" value="tc" />
+            <node concept="3uibUv" id="3IIf9O_tnmK" role="1tU5fm">
+              <ref role="3uigEE" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
+            </node>
+            <node concept="2YIFZM" id="3IIf9O_tnmL" role="33vP2m">
+              <ref role="37wK5l" to="qox2:4Z$O9mrQIG1" resolve="get" />
+              <ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
+              <node concept="37vLTw" id="3IIf9O_tnmM" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9O_tnmN" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_tnmO" role="3cpWs9">
+            <property role="TrG5h" value="typesCache" />
+            <node concept="3uibUv" id="3IIf9O_tnmP" role="1tU5fm">
+              <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
+            </node>
+            <node concept="2OqwBi" id="3IIf9O_tnmQ" role="33vP2m">
+              <node concept="37vLTw" id="3IIf9O_tnmR" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_tnmJ" resolve="tc" />
+              </node>
+              <node concept="liA8E" id="3IIf9O_tnmS" role="2OqNvi">
+                <ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
+                <node concept="2OqwBi" id="3IIf9O_tnmT" role="37wK5m">
+                  <node concept="2JrnkZ" id="3IIf9O_tnmU" role="2Oq$k0">
+                    <node concept="37vLTw" id="3IIf9O_tnmV" role="2JrQYb">
+                      <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3IIf9O_tnmW" role="2OqNvi">
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3IIf9O_tnmX" role="3cqZAp">
+          <node concept="3clFbS" id="3IIf9O_tnmY" role="3clFbx">
+            <node concept="3clFbF" id="3IIf9O_tnmZ" role="3cqZAp">
+              <node concept="37vLTI" id="3IIf9O_tnn0" role="3clFbG">
+                <node concept="37vLTw" id="3IIf9O_tnn1" role="37vLTJ">
+                  <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
+                </node>
+                <node concept="2OqwBi" id="3IIf9O_tnn2" role="37vLTx">
+                  <node concept="37vLTw" id="3IIf9O_tnn3" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3IIf9O_tnmJ" resolve="tc" />
+                  </node>
+                  <node concept="liA8E" id="3IIf9O_tnn4" role="2OqNvi">
+                    <ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
+                    <node concept="2OqwBi" id="3IIf9O_tnn5" role="37wK5m">
+                      <node concept="2JrnkZ" id="3IIf9O_tnn6" role="2Oq$k0">
+                        <node concept="37vLTw" id="3IIf9O_tnn7" role="2JrQYb">
+                          <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="3IIf9O_tnn8" role="2OqNvi">
+                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                      </node>
+                    </node>
+                    <node concept="1bVj0M" id="3IIf9O_tnn9" role="37wK5m">
+                      <node concept="3clFbS" id="3IIf9O_tnna" role="1bW5cS">
+                        <node concept="3clFbF" id="3IIf9O_tnnb" role="3cqZAp">
+                          <node concept="1rXfSq" id="3IIf9O_tnnc" role="3clFbG">
+                            <ref role="37wK5l" node="3IIf9O_qVvl" resolve="calcTypecheckingCache" />
+                            <node concept="10M0yZ" id="2Mi2iz0OEzQ" role="37wK5m">
+                              <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
+                              <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                            </node>
+                            <node concept="37vLTw" id="3IIf9O_tnne" role="37wK5m">
+                              <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                            </node>
+                            <node concept="2ShNRf" id="3IIf9O_tnnf" role="37wK5m">
+                              <node concept="Tc6Ow" id="3IIf9O_tnng" role="2ShVmc">
+                                <node concept="3Tqbb2" id="3IIf9O_tnnh" role="HW$YZ" />
+                                <node concept="37vLTw" id="3IIf9O_tnni" role="HW$Y0">
+                                  <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbH" id="3IIf9O_tnnj" role="3cqZAp" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="3IIf9O_tnnk" role="3clFbw">
+            <node concept="10Nm6u" id="3IIf9O_tnnl" role="3uHU7w" />
+            <node concept="37vLTw" id="3IIf9O_tnnm" role="3uHU7B">
+              <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_tnnn" role="3cqZAp" />
+        <node concept="3clFbJ" id="3IIf9O_tnno" role="3cqZAp">
+          <node concept="3clFbS" id="3IIf9O_tnnp" role="3clFbx">
+            <node concept="3cpWs6" id="3IIf9O_tnnq" role="3cqZAp">
+              <node concept="2OqwBi" id="3IIf9O_tnnr" role="3cqZAk">
+                <node concept="1eOMI4" id="3IIf9O_tnns" role="2Oq$k0">
+                  <node concept="10QFUN" id="3IIf9O_tnnt" role="1eOMHV">
+                    <node concept="3uibUv" id="3IIf9O_tnnu" role="10QFUM">
+                      <ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
+                    </node>
+                    <node concept="37vLTw" id="3IIf9O_tnnv" role="10QFUP">
+                      <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="3IIf9O_tnnw" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:6QH_LDtffJj" resolve="typeOf" />
+                  <node concept="2OqwBi" id="3IIf9O_tnnx" role="37wK5m">
+                    <node concept="2JrnkZ" id="3IIf9O_tnny" role="2Oq$k0">
+                      <node concept="37vLTw" id="3IIf9O_tnnz" role="2JrQYb">
+                        <ref role="3cqZAo" node="3IIf9O_tkBA" resolve="node" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3IIf9O_tnn$" role="2OqNvi">
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="3IIf9O_tnn_" role="3clFbw">
+            <node concept="10Nm6u" id="3IIf9O_tnnA" role="3uHU7w" />
+            <node concept="37vLTw" id="3IIf9O_tnnB" role="3uHU7B">
+              <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9O_tnnC" role="3cqZAp">
+          <node concept="10Nm6u" id="3IIf9O_tnnD" role="3clFbG" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="3IIf9O_tpzW" role="lGtFl">
+        <node concept="TZ5HA" id="3IIf9O_tpzX" role="TZ5H$">
+          <node concept="1dT_AC" id="3IIf9O_tpzY" role="1dT_Ay">
+            <property role="1dT_AB" value="Must be called in a read action." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3IIf9OA6IYd" role="jymVt" />
+    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
+      <property role="TrG5h" value="calcIsSubtype" />
+      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
+        <property role="TrG5h" value="subtype" />
+        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
+        <property role="TrG5h" value="supertype" />
+        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
+      <node concept="3Tm1VV" id="3IIf9OAgpFW" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
+        <node concept="3SKdUt" id="3IIf9OAgsqm" role="3cqZAp">
+          <node concept="3SKdUq" id="3IIf9OAgsqn" role="3SKWNk">
+            <property role="3SKdUp" value="ensure we can read the model" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="3IIf9OAgsqo" role="3cqZAp">
+          <node concept="2OqwBi" id="3IIf9OAgsqp" role="3clFbG">
+            <node concept="2OqwBi" id="3IIf9OAgsqq" role="2Oq$k0">
+              <node concept="37vLTw" id="3IIf9OAgsqr" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="3IIf9OAgsqs" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="3IIf9OAgsqt" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9OAgszp" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9OAm07j" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAm07k" role="3cpWs9">
+            <property role="TrG5h" value="nodes" />
+            <node concept="_YKpA" id="3IIf9OAm07d" role="1tU5fm">
+              <node concept="3Tqbb2" id="3IIf9OAm07g" role="_ZDj9" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9OAm07l" role="33vP2m">
+              <node concept="Tc6Ow" id="3IIf9OAm07m" role="2ShVmc">
+                <node concept="3Tqbb2" id="3IIf9OAm07n" role="HW$YZ" />
+                <node concept="37vLTw" id="3IIf9OAm07o" role="HW$Y0">
+                  <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="subtype" />
+                </node>
+                <node concept="37vLTw" id="3IIf9OAm07p" role="HW$Y0">
+                  <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="supertype" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9OAgt3E" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgt3F" role="3cpWs9">
+            <property role="TrG5h" value="applyTemplatesStep" />
+            <node concept="3uibUv" id="3IIf9OAgt3G" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9OAgt3H" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9OAgt3I" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <node concept="37vLTw" id="3IIf9OAm07q" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
+                </node>
+                <node concept="37vLTw" id="3IIf9OAgt3L" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+                <node concept="10M0yZ" id="2Mi2iz0Ozas" role="37wK5m">
+                  <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="SUBTYPE" />
+                  <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9OAgt3M" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgt3N" role="3cpWs9">
+            <property role="TrG5h" value="evaluateRulesStep" />
+            <property role="3TUv4t" value="false" />
+            <node concept="3uibUv" id="3IIf9OAgt3O" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9OAgt3P" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9OAgt3Q" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:3IIf9OAgFCl" resolve="EvaluateRulesStep" />
+                <node concept="37vLTw" id="3IIf9OAgt3R" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="3IIf9OAm0Wh" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9OAgszz" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3IIf9OAgvDM" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$l_TFV" resolve="TypecheckingHelper" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9OAgvDN" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9OAgvDO" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:443LGHBiDEV" resolve="TypecheckingHelper" />
+                <node concept="37vLTw" id="3IIf9OAgvDP" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9OAgt3F" resolve="applyTemplatesStep" />
+                </node>
+                <node concept="37vLTw" id="3IIf9OAgvDQ" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9OAgt3N" resolve="evaluateRulesStep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9OAgx7T" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
+            <property role="TrG5h" value="lastStep" />
+            <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
+            </node>
+            <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
+              <node concept="2OqwBi" id="3IIf9OAgx7W" role="2Oq$k0">
+                <node concept="37vLTw" id="3IIf9OAgx7X" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:2mbQB8J5m$l" resolve="scheduleExecute" />
+                  <node concept="2YIFZM" id="3IIf9OAgx7Z" role="37wK5m">
+                    <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                    <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
+                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9OAgsHG" role="3cqZAp" />
+        <node concept="3clFbF" id="3IIf9OAgsGa" role="3cqZAp">
+          <node concept="3clFbT" id="3IIf9OAgsG9" role="3clFbG">
+            <property role="3clFbU" value="false" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3IIf9OAgpnk" role="jymVt" />
+    <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
+      <node concept="37vLTG" id="3IIf9O_u8h8" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="3IIf9O_u8ki" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7kaxm0sEBCp" role="3clF45" />
+      <node concept="3Tmbuc" id="3IIf9O_Zcfj" role="1B3o_S" />
+      <node concept="3clFbS" id="7kaxm0sEBCr" role="3clF47">
+        <node concept="3clFbF" id="3IIf9O_u8qZ" role="3cqZAp">
+          <node concept="37vLTI" id="3IIf9O_u8r1" role="3clFbG">
+            <node concept="2OqwBi" id="3IIf9O_u8KX" role="37vLTJ">
+              <node concept="Xjq3P" id="3IIf9O_u8Pt" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3IIf9O_u8L0" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3IIf9O_u8r5" role="37vLTx">
+              <ref role="3cqZAo" node="3IIf9O_u8h8" resolve="repository" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3IIf9O_qYyg" role="jymVt" />
+    <node concept="3clFb_" id="3IIf9O_qVvl" role="jymVt">
+      <property role="TrG5h" value="calcTypecheckingCache" />
+      <node concept="3Tm6S6" id="3IIf9O_qVvm" role="1B3o_S" />
+      <node concept="3uibUv" id="3IIf9O_qZis" role="3clF45">
+        <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="ModelTypeCache" />
+      </node>
+      <node concept="37vLTG" id="3IIf9O_r1EB" role="3clF46">
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="2Mi2iz0OC5L" role="1tU5fm">
+          <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3IIf9O_qVvb" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="3IIf9O_qVvc" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="3IIf9O_qVvd" role="3clF46">
+        <property role="TrG5h" value="nodes" />
+        <node concept="2I9FWS" id="3IIf9O_rcZS" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="3IIf9O_qVt_" role="3clF47">
+        <node concept="3cpWs8" id="3IIf9O_qVtA" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVtB" role="3cpWs9">
+            <property role="TrG5h" value="newCache" />
+            <node concept="3uibUv" id="3IIf9O_qVtC" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="ModelTypeCache" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9O_qVtD" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9O_qVtE" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:6QH_LDtcxgh" resolve="ModelTypeCache" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_qVtF" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9O_qVtG" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVtH" role="3cpWs9">
+            <property role="TrG5h" value="applyTemplatesStep" />
+            <node concept="3uibUv" id="3IIf9O_qVtI" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9O_qVtJ" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9O_qVtK" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
+                <node concept="37vLTw" id="3IIf9O_qVvh" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
+                </node>
+                <node concept="37vLTw" id="3IIf9O_qVvf" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
+                </node>
+                <node concept="37vLTw" id="2Mi2iz0ODA$" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryKind" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9O_qVtN" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVtO" role="3cpWs9">
+            <property role="TrG5h" value="evaluateRulesStep" />
+            <property role="3TUv4t" value="false" />
+            <node concept="3uibUv" id="3IIf9O_qVtP" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9O_qVtQ" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9O_qVtR" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:1pPth$lHpLU" resolve="EvaluateRulesStep" />
+                <node concept="37vLTw" id="3IIf9O_qVvg" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9O_qVtT" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVtU" role="3cpWs9">
+            <property role="TrG5h" value="collectTypesStep" />
+            <node concept="3uibUv" id="3IIf9O_qVtV" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9O_qVtW" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9O_qVtX" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:6IQb_RxlCdT" resolve="CollectTypesStep" />
+                <node concept="37vLTw" id="3IIf9O_qVvi" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3IIf9O_qVtZ" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVu0" role="3cpWs9">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3IIf9O_qVu1" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$l_TFV" resolve="TypecheckingHelper" />
+            </node>
+            <node concept="2ShNRf" id="3IIf9O_qVu2" role="33vP2m">
+              <node concept="1pGfFk" id="3IIf9O_qVu3" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:443LGHBiDEV" resolve="TypecheckingHelper" />
+                <node concept="37vLTw" id="3IIf9O_qVu4" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVtH" resolve="applyTemplatesStep" />
+                </node>
+                <node concept="37vLTw" id="3IIf9O_qVu5" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVtO" resolve="evaluateRulesStep" />
+                </node>
+                <node concept="37vLTw" id="3IIf9O_qVu6" role="37wK5m">
+                  <ref role="3cqZAo" node="3IIf9O_qVtU" resolve="collectTypesStep" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_qVu7" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9O_qVu8" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9O_qVu9" role="3cpWs9">
+            <property role="TrG5h" value="lastStep" />
+            <node concept="3uibUv" id="3IIf9O_qVua" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+              <node concept="3qTvmN" id="3IIf9O_qVub" role="11_B2D" />
+            </node>
+            <node concept="2OqwBi" id="3IIf9O_qVuc" role="33vP2m">
+              <node concept="2OqwBi" id="3IIf9O_qVud" role="2Oq$k0">
+                <node concept="37vLTw" id="3IIf9O_qVue" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3IIf9O_qVu0" resolve="helper" />
+                </node>
+                <node concept="liA8E" id="3IIf9O_qVuf" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:2mbQB8J5m$l" resolve="scheduleExecute" />
+                  <node concept="2YIFZM" id="3IIf9O_qVug" role="37wK5m">
+                    <ref role="1Pybhc" to="tj24:3KwBCAA_ela" resolve="TypecheckingSchedulers" />
+                    <ref role="37wK5l" to="tj24:3KwBCAA_erO" resolve="blocking" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="3IIf9O_qVuh" role="2OqNvi">
+                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_qVui" role="3cqZAp" />
+        <node concept="3clFbJ" id="3IIf9O_qVuj" role="3cqZAp">
+          <node concept="3clFbS" id="3IIf9O_qVuk" role="3clFbx">
+            <node concept="3cpWs8" id="3IIf9O_qVul" role="3cqZAp">
+              <node concept="3cpWsn" id="3IIf9O_qVum" role="3cpWs9">
+                <property role="TrG5h" value="typesModelOwner" />
+                <node concept="3uibUv" id="3IIf9O_qVun" role="1tU5fm">
+                  <ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
+                </node>
+                <node concept="2OqwBi" id="3IIf9O_qVuo" role="33vP2m">
+                  <node concept="1eOMI4" id="3IIf9O_qVup" role="2Oq$k0">
+                    <node concept="10QFUN" id="3IIf9O_qVuq" role="1eOMHV">
+                      <node concept="3uibUv" id="3IIf9O_qVur" role="10QFUM">
+                        <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+                      </node>
+                      <node concept="37vLTw" id="3IIf9O_qVus" role="10QFUP">
+                        <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3IIf9O_qVut" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:443LGHBQB8e" resolve="getTypesModelOwner" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3IIf9O_qVuu" role="3cqZAp">
+              <node concept="2OqwBi" id="3IIf9O_qVuv" role="3clFbG">
+                <node concept="37vLTw" id="3IIf9O_qVuw" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3IIf9O_qVum" resolve="typesModelOwner" />
+                </node>
+                <node concept="liA8E" id="3IIf9O_qVux" role="2OqNvi">
+                  <ref role="37wK5l" to="qox2:2zU3cYq$eDA" resolve="unregister" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3IIf9O_qVuy" role="3cqZAp">
+              <node concept="2OqwBi" id="3IIf9O_qVuz" role="3clFbG">
+                <node concept="37vLTw" id="3IIf9O_qVu$" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
+                </node>
+                <node concept="liA8E" id="3IIf9O_qVu_" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:6QH_LDtcxgx" resolve="setTypesModel" />
+                  <node concept="37vLTw" id="3IIf9O_qVuA" role="37wK5m">
+                    <ref role="3cqZAo" node="3IIf9O_qVum" resolve="typesModelOwner" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="3IIf9O_qVuB" role="3cqZAp">
+              <node concept="3cpWsn" id="3IIf9O_qVuC" role="3cpWs9">
+                <property role="TrG5h" value="typeNodes" />
+                <node concept="3rvAFt" id="3IIf9O_qVuD" role="1tU5fm">
+                  <node concept="3Tqbb2" id="3IIf9O_qVuE" role="3rvSg0" />
+                  <node concept="3uibUv" id="3IIf9O_qVuF" role="3rvQeY">
+                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3IIf9O_qVuG" role="33vP2m">
+                  <node concept="1eOMI4" id="3IIf9O_qVuH" role="2Oq$k0">
+                    <node concept="10QFUN" id="3IIf9O_qVuI" role="1eOMHV">
+                      <node concept="3uibUv" id="3IIf9O_qVuJ" role="10QFUM">
+                        <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+                      </node>
+                      <node concept="37vLTw" id="3IIf9O_qVuK" role="10QFUP">
+                        <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3IIf9O_qVuL" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:6IQb_RxlNhw" resolve="getTypeNodes" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1DcWWT" id="3IIf9O_qVuM" role="3cqZAp">
+              <node concept="3clFbS" id="3IIf9O_qVuN" role="2LFqv$">
+                <node concept="3clFbF" id="3IIf9O_qVuO" role="3cqZAp">
+                  <node concept="2OqwBi" id="3IIf9O_qVuP" role="3clFbG">
+                    <node concept="37vLTw" id="3IIf9O_qVuQ" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
+                    </node>
+                    <node concept="liA8E" id="3IIf9O_qVuR" role="2OqNvi">
+                      <ref role="37wK5l" to="tj24:6QH_LDtcYUC" resolve="putType" />
+                      <node concept="2OqwBi" id="3IIf9O_qVuS" role="37wK5m">
+                        <node concept="37vLTw" id="3IIf9O_qVuT" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3IIf9O_qVuY" resolve="m" />
+                        </node>
+                        <node concept="3AY5_j" id="3IIf9O_qVuU" role="2OqNvi" />
+                      </node>
+                      <node concept="2OqwBi" id="3IIf9O_qVuV" role="37wK5m">
+                        <node concept="37vLTw" id="3IIf9O_qVuW" role="2Oq$k0">
+                          <ref role="3cqZAo" node="3IIf9O_qVuY" resolve="m" />
+                        </node>
+                        <node concept="3AV6Ez" id="3IIf9O_qVuX" role="2OqNvi" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="3IIf9O_qVuY" role="1Duv9x">
+                <property role="TrG5h" value="m" />
+                <node concept="3f3tKP" id="3IIf9O_qVuZ" role="1tU5fm">
+                  <node concept="3uibUv" id="3IIf9O_qVv0" role="3f3zw5">
+                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                  </node>
+                  <node concept="3Tqbb2" id="3IIf9O_qVv1" role="3f3$T$" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3IIf9O_qVv2" role="1DdaDG">
+                <node concept="37vLTw" id="3IIf9O_qVv3" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3IIf9O_qVuC" resolve="typeNodes" />
+                </node>
+                <node concept="3CFNJx" id="3IIf9O_qVv4" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+          <node concept="2ZW3vV" id="3IIf9O_qVv5" role="3clFbw">
+            <node concept="3uibUv" id="3IIf9O_qVv6" role="2ZW6by">
+              <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+            </node>
+            <node concept="37vLTw" id="3IIf9O_qVv7" role="2ZW6bz">
+              <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3IIf9O_qVv8" role="3cqZAp" />
+        <node concept="3clFbF" id="3IIf9O_qVv9" role="3cqZAp">
+          <node concept="37vLTw" id="3IIf9O_qVva" role="3clFbG">
+            <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6QH_LDtaCb7" role="jymVt" />
+    <node concept="3Tm1VV" id="7kaxm0sEy3f" role="1B3o_S" />
+    <node concept="312cEg" id="3IIf9O_u8qV" role="jymVt">
+      <property role="TrG5h" value="repository" />
+      <node concept="3Tm6S6" id="3IIf9O_u8qW" role="1B3o_S" />
+      <node concept="3uibUv" id="3IIf9O_u8qY" role="1tU5fm">
+        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="4t7Xo7inNgi">
+    <property role="TrG5h" value="TypecheckingQueryKind" />
+    <node concept="2tJIrI" id="4t7Xo7inNkz" role="jymVt" />
+    <node concept="Wx3nA" id="4t7Xo7inNvw" role="jymVt">
+      <property role="TrG5h" value="TYPECHECK" />
+      <node concept="3Tm1VV" id="2Mi2iz0OoCw" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7inN$E" role="1tU5fm">
+        <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+      </node>
+      <node concept="2ShNRf" id="4t7Xo7inNOo" role="33vP2m">
+        <node concept="1pGfFk" id="4t7Xo7inNGW" role="2ShVmc">
+          <ref role="37wK5l" node="4t7Xo7inNpI" resolve="TypecheckingQueryKind" />
+          <node concept="Xl_RD" id="4t7Xo7inOzL" role="37wK5m">
+            <property role="Xl_RC" value="typecheck" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7inOCn" role="jymVt" />
+    <node concept="Wx3nA" id="4t7Xo7inO_s" role="jymVt">
+      <property role="TrG5h" value="SUBTYPE" />
+      <node concept="3Tm1VV" id="2Mi2iz0OoF2" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7inO_u" role="1tU5fm">
+        <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+      </node>
+      <node concept="2ShNRf" id="4t7Xo7inO_v" role="33vP2m">
+        <node concept="1pGfFk" id="4t7Xo7inO_w" role="2ShVmc">
+          <ref role="37wK5l" node="4t7Xo7inNpI" resolve="TypecheckingQueryKind" />
+          <node concept="Xl_RD" id="4t7Xo7inO_x" role="37wK5m">
+            <property role="Xl_RC" value="subtype" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7inNqu" role="jymVt" />
+    <node concept="2YIFZL" id="4t7Xo7ivOW6" role="jymVt">
+      <property role="TrG5h" value="fromFqName" />
+      <node concept="37vLTG" id="4t7Xo7ivP5g" role="3clF46">
+        <property role="TrG5h" value="fqName" />
+        <node concept="17QB3L" id="4t7Xo7ivP8I" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="4t7Xo7ivP13" role="3clF45">
+        <ref role="3uigEE" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+      </node>
+      <node concept="3Tm1VV" id="4t7Xo7ivOW9" role="1B3o_S" />
+      <node concept="3clFbS" id="4t7Xo7ivOWa" role="3clF47">
+        <node concept="3clFbJ" id="4t7Xo7ivZ7l" role="3cqZAp">
+          <node concept="3clFbS" id="4t7Xo7ivZ7n" role="3clFbx">
+            <node concept="3cpWs6" id="4t7Xo7iw1dO" role="3cqZAp">
+              <node concept="37vLTw" id="4t7Xo7iw1uD" role="3cqZAk">
+                <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4t7Xo7iw0ft" role="3clFbw">
+            <node concept="2OqwBi" id="4t7Xo7ivZCe" role="2Oq$k0">
+              <node concept="37vLTw" id="4t7Xo7ivZmC" role="2Oq$k0">
+                <ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
+              </node>
+              <node concept="liA8E" id="4t7Xo7ivZSW" role="2OqNvi">
+                <ref role="37wK5l" node="4t7Xo7ivVfN" resolve="fqName" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4t7Xo7iw0Kl" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <node concept="37vLTw" id="4t7Xo7iw11c" role="37wK5m">
+                <ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="4t7Xo7iw1yc" role="3cqZAp">
+          <node concept="3clFbS" id="4t7Xo7iw1yd" role="3clFbx">
+            <node concept="3cpWs6" id="4t7Xo7iw1ye" role="3cqZAp">
+              <node concept="37vLTw" id="4t7Xo7iw1RR" role="3cqZAk">
+                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="SUBTYPE" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="4t7Xo7iw1yg" role="3clFbw">
+            <node concept="2OqwBi" id="4t7Xo7iw1yh" role="2Oq$k0">
+              <node concept="37vLTw" id="4t7Xo7iw1IC" role="2Oq$k0">
+                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="SUBTYPE" />
+              </node>
+              <node concept="liA8E" id="4t7Xo7iw1yj" role="2OqNvi">
+                <ref role="37wK5l" node="4t7Xo7ivVfN" resolve="fqName" />
+              </node>
+            </node>
+            <node concept="liA8E" id="4t7Xo7iw1yk" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <node concept="37vLTw" id="4t7Xo7iw1yl" role="37wK5m">
+                <ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4t7Xo7iw246" role="3cqZAp">
+          <node concept="10Nm6u" id="4t7Xo7iw2eg" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2Mi2iz0Xmmt" role="jymVt" />
+    <node concept="3clFb_" id="2Mi2iz0Xxrq" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="toString" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="2Mi2iz0Xxrr" role="1B3o_S" />
+      <node concept="17QB3L" id="2Mi2iz0Yjii" role="3clF45" />
+      <node concept="3clFbS" id="2Mi2iz0Xxru" role="3clF47">
+        <node concept="3clFbF" id="2Mi2iz0Xz1C" role="3cqZAp">
+          <node concept="1rXfSq" id="2Mi2iz0Xz1B" role="3clFbG">
+            <ref role="37wK5l" node="4t7Xo7ivVfN" resolve="fqName" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2Mi2iz0Xxrv" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2Mi2iz0Xybp" role="jymVt" />
+    <node concept="3clFbW" id="4t7Xo7inNpI" role="jymVt">
+      <node concept="37vLTG" id="4t7Xo7inNON" role="3clF46">
+        <property role="TrG5h" value="name" />
+        <node concept="17QB3L" id="4t7Xo7inNSH" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="4t7Xo7inNpK" role="3clF45" />
+      <node concept="3Tm6S6" id="4t7Xo7inNq7" role="1B3o_S" />
+      <node concept="3clFbS" id="4t7Xo7inNpM" role="3clF47">
+        <node concept="3clFbF" id="4t7Xo7inNV1" role="3cqZAp">
+          <node concept="37vLTI" id="4t7Xo7inNV3" role="3clFbG">
+            <node concept="2OqwBi" id="4t7Xo7inO8v" role="37vLTJ">
+              <node concept="Xjq3P" id="4t7Xo7inOgp" role="2Oq$k0" />
+              <node concept="2OwXpG" id="4t7Xo7inOqV" role="2OqNvi">
+                <ref role="2Oxat5" node="4t7Xo7inNUX" resolve="name" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="4t7Xo7inNV7" role="37vLTx">
+              <ref role="3cqZAo" node="4t7Xo7inNON" resolve="name" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7inNkJ" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7ivVfN" role="jymVt">
+      <property role="TrG5h" value="fqName" />
+      <node concept="17QB3L" id="4t7Xo7ivYJt" role="3clF45" />
+      <node concept="3Tm1VV" id="4t7Xo7ivVfQ" role="1B3o_S" />
+      <node concept="3clFbS" id="4t7Xo7ivVfR" role="3clF47">
+        <node concept="3clFbF" id="4t7Xo7ivWel" role="3cqZAp">
+          <node concept="3cpWs3" id="4t7Xo7ivYds" role="3clFbG">
+            <node concept="37vLTw" id="4t7Xo7ivYx_" role="3uHU7w">
+              <ref role="3cqZAo" node="4t7Xo7inNUX" resolve="name" />
+            </node>
+            <node concept="3cpWs3" id="4t7Xo7ivXh8" role="3uHU7B">
+              <node concept="2OqwBi" id="4t7Xo7ivWyB" role="3uHU7B">
+                <node concept="2OqwBi" id="2Mi2iz0Yf4b" role="2Oq$k0">
+                  <node concept="1rXfSq" id="4t7Xo7ivWek" role="2Oq$k0">
+                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  </node>
+                  <node concept="liA8E" id="2Mi2iz0YfRL" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="4t7Xo7ivWVU" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
+                </node>
+              </node>
+              <node concept="Xl_RD" id="4t7Xo7ivXoD" role="3uHU7w">
+                <property role="Xl_RC" value="." />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7ivV0z" role="jymVt" />
+    <node concept="3Tm1VV" id="4t7Xo7inNgj" role="1B3o_S" />
+    <node concept="3uibUv" id="4t7Xo7inNjm" role="EKbjA">
+      <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+    </node>
+    <node concept="312cEg" id="4t7Xo7inNUX" role="jymVt">
+      <property role="TrG5h" value="name" />
+      <node concept="3Tm6S6" id="4t7Xo7inNUY" role="1B3o_S" />
+      <node concept="17QB3L" id="4t7Xo7inNV0" role="1tU5fm" />
+    </node>
+  </node>
+</model>
+
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
index 5dcae089..379d7253 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/service.mps
@@ -45,6 +45,7 @@
     <import index="e5vs" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:org.jetbrains.ide(MPS.IDEA/)" />
     <import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -330,7 +331,6 @@
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -370,7 +370,6 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
@@ -419,10 +418,6 @@
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
-      <concept id="1240424373525" name="jetbrains.mps.baseLanguage.collections.structure.MappingType" flags="in" index="3f3tKP">
-        <child id="1240424397093" name="keyType" index="3f3zw5" />
-        <child id="1240424402756" name="valueType" index="3f3$T$" />
-      </concept>
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -447,7 +442,6 @@
       <concept id="9042586985346099736" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariable" flags="ng" index="1_o_bG" />
       <concept id="1240824834947" name="jetbrains.mps.baseLanguage.collections.structure.ValueAccessOperation" flags="nn" index="3AV6Ez" />
       <concept id="1240825616499" name="jetbrains.mps.baseLanguage.collections.structure.KeyAccessOperation" flags="nn" index="3AY5_j" />
-      <concept id="1240854379201" name="jetbrains.mps.baseLanguage.collections.structure.MappingsSetOperation" flags="nn" index="3CFNJx" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
         <child id="1197932525128" name="key" index="3ElVtu" />
@@ -463,863 +457,6 @@
       </concept>
     </language>
   </registry>
-  <node concept="312cEu" id="7kaxm0sEy3e">
-    <property role="TrG5h" value="TypecheckingFacade" />
-    <node concept="2tJIrI" id="7kaxm0sEy44" role="jymVt" />
-    <node concept="2YIFZL" id="3IIf9O_u0Ck" role="jymVt">
-      <property role="TrG5h" value="typeOf" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="7kaxm0sEBHw" role="3clF47">
-        <node concept="3clFbF" id="3IIf9O_u1a4" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9O_u1Ig" role="3clFbG">
-            <node concept="2YIFZM" id="3IIf9O_Z9Gn" role="2Oq$k0">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
-              <node concept="37vLTw" id="3IIf9O_Z9Go" role="37wK5m">
-                <ref role="3cqZAo" node="7kaxm0sEBL9" resolve="node" />
-              </node>
-            </node>
-            <node concept="liA8E" id="3IIf9O_u1WZ" role="2OqNvi">
-              <ref role="37wK5l" node="3IIf9O_tkwF" resolve="getTypeOf" />
-              <node concept="37vLTw" id="3IIf9O_u2vc" role="37wK5m">
-                <ref role="3cqZAo" node="7kaxm0sEBL9" resolve="node" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7kaxm0sEBL9" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="7kaxm0sEBLY" role="1tU5fm" />
-      </node>
-      <node concept="3Tqbb2" id="7kaxm0sEBIE" role="3clF45" />
-      <node concept="P$JXv" id="7kaxm0sEBMI" role="lGtFl">
-        <node concept="TZ5HA" id="7kaxm0sEBMJ" role="TZ5H$">
-          <node concept="1dT_AC" id="7kaxm0sEBMK" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7kaxm0sEBHv" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="3IIf9O_tka_" role="jymVt" />
-    <node concept="2YIFZL" id="3IIf9OA4ZMD" role="jymVt">
-      <property role="TrG5h" value="isSubtype" />
-      <node concept="37vLTG" id="3IIf9OA507H" role="3clF46">
-        <property role="TrG5h" value="subtype" />
-        <node concept="3Tqbb2" id="3IIf9OA50cS" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3IIf9OA50dD" role="3clF46">
-        <property role="TrG5h" value="supertype" />
-        <node concept="3Tqbb2" id="3IIf9OA50gM" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="3IIf9OA4ZSv" role="3clF45" />
-      <node concept="3Tm1VV" id="3IIf9OA4ZMG" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OA4ZMH" role="3clF47">
-        <node concept="YS8fn" id="3IIf9OA50t1" role="3cqZAp">
-          <node concept="2ShNRf" id="3IIf9OA50xX" role="YScLw">
-            <node concept="1pGfFk" id="3IIf9OA51iD" role="2ShVmc">
-              <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="3IIf9OA51l$" role="lGtFl">
-        <node concept="TZ5HA" id="3IIf9OA51l_" role="TZ5H$">
-          <node concept="1dT_AC" id="3IIf9OA51lA" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OA4Zhw" role="jymVt" />
-    <node concept="2YIFZL" id="3IIf9O_Z6Ip" role="jymVt">
-      <property role="TrG5h" value="forNode" />
-      <node concept="37vLTG" id="3IIf9O_Z79b" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3IIf9O_Z7fM" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="3IIf9O_Z77V" role="3clF45">
-        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
-      </node>
-      <node concept="3Tm1VV" id="3IIf9O_Z6Is" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9O_Z6It" role="3clF47">
-        <node concept="3clFbF" id="3IIf9O_Z8fP" role="3cqZAp">
-          <node concept="2ShNRf" id="3IIf9O_Z8fL" role="3clFbG">
-            <node concept="1pGfFk" id="3IIf9O_Z9pb" role="2ShVmc">
-              <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingFacade" />
-              <node concept="2YIFZM" id="3IIf9O_Z9Ao" role="37wK5m">
-                <ref role="37wK5l" node="3IIf9O_tL1f" resolve="repository" />
-                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingFacade" />
-                <node concept="37vLTw" id="3IIf9O_Z9Ap" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_Z79b" resolve="node" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="P$JXv" id="3IIf9O_Zcd$" role="lGtFl">
-        <node concept="TZ5HA" id="3IIf9O_Zcd_" role="TZ5H$">
-          <node concept="1dT_AC" id="3IIf9O_ZcdA" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9O_Z6oz" role="jymVt" />
-    <node concept="2YIFZL" id="3IIf9O_tL1f" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="3IIf9O_tJHw" role="3clF47">
-        <node concept="3cpWs8" id="3IIf9O_tJHx" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_tJHy" role="3cpWs9">
-            <property role="TrG5h" value="unit" />
-            <node concept="H_c77" id="3IIf9O_tJHz" role="1tU5fm" />
-            <node concept="2OqwBi" id="3IIf9O_tJH$" role="33vP2m">
-              <node concept="37vLTw" id="3IIf9O_tJH_" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_tJHs" resolve="node" />
-              </node>
-              <node concept="I4A8Y" id="3IIf9O_tJHA" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3IIf9O_tJHD" role="3cqZAp">
-          <node concept="3clFbS" id="3IIf9O_tJHE" role="3clFbx">
-            <node concept="3SKdUt" id="3IIf9O_tRYY" role="3cqZAp">
-              <node concept="3SKdUq" id="3IIf9O_tRZ0" role="3SKWNk">
-                <property role="3SKdUp" value="FIXME the default repository" />
-              </node>
-            </node>
-            <node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
-              <node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
-                <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
-                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
-              </node>
-            </node>
-            <node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
-          </node>
-          <node concept="3clFbC" id="3IIf9O_tJHH" role="3clFbw">
-            <node concept="10Nm6u" id="3IIf9O_tJHI" role="3uHU7w" />
-            <node concept="37vLTw" id="3IIf9O_tJHJ" role="3uHU7B">
-              <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_tJHK" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9O_tJHL" role="3clFbG">
-            <node concept="2JrnkZ" id="3IIf9O_tJHM" role="2Oq$k0">
-              <node concept="37vLTw" id="3IIf9O_tJHN" role="2JrQYb">
-                <ref role="3cqZAo" node="3IIf9O_tJHy" resolve="unit" />
-              </node>
-            </node>
-            <node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="3IIf9O_tJHs" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3IIf9O_tJHt" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="3IIf9O_tJHu" role="3clF45">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-      <node concept="3Tm6S6" id="3IIf9O_tJHv" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="3IIf9O_Z7tT" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9O_tkwF" role="jymVt">
-      <property role="TrG5h" value="getTypeOf" />
-      <node concept="37vLTG" id="3IIf9O_tkBA" role="3clF46">
-        <property role="TrG5h" value="node" />
-        <node concept="3Tqbb2" id="3IIf9O_tmJD" role="1tU5fm" />
-      </node>
-      <node concept="3Tqbb2" id="3IIf9O_tlg1" role="3clF45" />
-      <node concept="3Tm1VV" id="3IIf9O_tkwI" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9O_tkwJ" role="3clF47">
-        <node concept="3SKdUt" id="3IIf9O_tnmk" role="3cqZAp">
-          <node concept="3SKdUq" id="3IIf9O_tnml" role="3SKWNk">
-            <property role="3SKdUp" value="ensure we can read the model" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_tnmm" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9O_tnmn" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9O_tnmo" role="2Oq$k0">
-              <node concept="37vLTw" id="3IIf9O_tnmp" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-              <node concept="liA8E" id="3IIf9O_tnmq" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="3IIf9O_tnmr" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_tnms" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9O_tnmt" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_tnmu" role="3cpWs9">
-            <property role="TrG5h" value="containingRoot" />
-            <node concept="3Tqbb2" id="3IIf9O_tnmv" role="1tU5fm" />
-            <node concept="2OqwBi" id="3IIf9O_tnmw" role="33vP2m">
-              <node concept="37vLTw" id="3IIf9O_tnmx" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_tkBA" resolve="node" />
-              </node>
-              <node concept="2Rxl7S" id="3IIf9O_tnmy" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_tnmH" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9O_tnmI" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_tnmJ" role="3cpWs9">
-            <property role="TrG5h" value="tc" />
-            <node concept="3uibUv" id="3IIf9O_tnmK" role="1tU5fm">
-              <ref role="3uigEE" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-            </node>
-            <node concept="2YIFZM" id="3IIf9O_tnmL" role="33vP2m">
-              <ref role="37wK5l" to="qox2:4Z$O9mrQIG1" resolve="get" />
-              <ref role="1Pybhc" to="qox2:4Z$O9mrQIzY" resolve="TypecheckingCache" />
-              <node concept="37vLTw" id="3IIf9O_tnmM" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9O_tnmN" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_tnmO" role="3cpWs9">
-            <property role="TrG5h" value="typesCache" />
-            <node concept="3uibUv" id="3IIf9O_tnmP" role="1tU5fm">
-              <ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
-            </node>
-            <node concept="2OqwBi" id="3IIf9O_tnmQ" role="33vP2m">
-              <node concept="37vLTw" id="3IIf9O_tnmR" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_tnmJ" resolve="tc" />
-              </node>
-              <node concept="liA8E" id="3IIf9O_tnmS" role="2OqNvi">
-                <ref role="37wK5l" to="qox2:4Z$O9mrQJgp" resolve="cachedTypes" />
-                <node concept="2OqwBi" id="3IIf9O_tnmT" role="37wK5m">
-                  <node concept="2JrnkZ" id="3IIf9O_tnmU" role="2Oq$k0">
-                    <node concept="37vLTw" id="3IIf9O_tnmV" role="2JrQYb">
-                      <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3IIf9O_tnmW" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="3IIf9O_tnmX" role="3cqZAp">
-          <node concept="3clFbS" id="3IIf9O_tnmY" role="3clFbx">
-            <node concept="3clFbF" id="3IIf9O_tnmZ" role="3cqZAp">
-              <node concept="37vLTI" id="3IIf9O_tnn0" role="3clFbG">
-                <node concept="37vLTw" id="3IIf9O_tnn1" role="37vLTJ">
-                  <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
-                </node>
-                <node concept="2OqwBi" id="3IIf9O_tnn2" role="37vLTx">
-                  <node concept="37vLTw" id="3IIf9O_tnn3" role="2Oq$k0">
-                    <ref role="3cqZAo" node="3IIf9O_tnmJ" resolve="tc" />
-                  </node>
-                  <node concept="liA8E" id="3IIf9O_tnn4" role="2OqNvi">
-                    <ref role="37wK5l" to="qox2:6QH_LDtbsGz" resolve="updateCachedTypes" />
-                    <node concept="2OqwBi" id="3IIf9O_tnn5" role="37wK5m">
-                      <node concept="2JrnkZ" id="3IIf9O_tnn6" role="2Oq$k0">
-                        <node concept="37vLTw" id="3IIf9O_tnn7" role="2JrQYb">
-                          <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="3IIf9O_tnn8" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                      </node>
-                    </node>
-                    <node concept="1bVj0M" id="3IIf9O_tnn9" role="37wK5m">
-                      <node concept="3clFbS" id="3IIf9O_tnna" role="1bW5cS">
-                        <node concept="3clFbF" id="3IIf9O_tnnb" role="3cqZAp">
-                          <node concept="1rXfSq" id="3IIf9O_tnnc" role="3clFbG">
-                            <ref role="37wK5l" node="3IIf9O_qVvl" resolve="calcTypecheckingCache" />
-                            <node concept="1rXfSq" id="3IIf9OA6IDH" role="37wK5m">
-                              <ref role="37wK5l" node="3IIf9OA6IDE" resolve="typecheckQueryFqName" />
-                            </node>
-                            <node concept="37vLTw" id="3IIf9O_tnne" role="37wK5m">
-                              <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                            </node>
-                            <node concept="2ShNRf" id="3IIf9O_tnnf" role="37wK5m">
-                              <node concept="Tc6Ow" id="3IIf9O_tnng" role="2ShVmc">
-                                <node concept="3Tqbb2" id="3IIf9O_tnnh" role="HW$YZ" />
-                                <node concept="37vLTw" id="3IIf9O_tnni" role="HW$Y0">
-                                  <ref role="3cqZAo" node="3IIf9O_tnmu" resolve="containingRoot" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="3clFbH" id="3IIf9O_tnnj" role="3cqZAp" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbC" id="3IIf9O_tnnk" role="3clFbw">
-            <node concept="10Nm6u" id="3IIf9O_tnnl" role="3uHU7w" />
-            <node concept="37vLTw" id="3IIf9O_tnnm" role="3uHU7B">
-              <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_tnnn" role="3cqZAp" />
-        <node concept="3clFbJ" id="3IIf9O_tnno" role="3cqZAp">
-          <node concept="3clFbS" id="3IIf9O_tnnp" role="3clFbx">
-            <node concept="3cpWs6" id="3IIf9O_tnnq" role="3cqZAp">
-              <node concept="2OqwBi" id="3IIf9O_tnnr" role="3cqZAk">
-                <node concept="1eOMI4" id="3IIf9O_tnns" role="2Oq$k0">
-                  <node concept="10QFUN" id="3IIf9O_tnnt" role="1eOMHV">
-                    <node concept="3uibUv" id="3IIf9O_tnnu" role="10QFUM">
-                      <ref role="3uigEE" node="6QH_LDtfe19" resolve="TypeCache" />
-                    </node>
-                    <node concept="37vLTw" id="3IIf9O_tnnv" role="10QFUP">
-                      <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="3IIf9O_tnnw" role="2OqNvi">
-                  <ref role="37wK5l" node="6QH_LDtffJj" resolve="typeOf" />
-                  <node concept="2OqwBi" id="3IIf9O_tnnx" role="37wK5m">
-                    <node concept="2JrnkZ" id="3IIf9O_tnny" role="2Oq$k0">
-                      <node concept="37vLTw" id="3IIf9O_tnnz" role="2JrQYb">
-                        <ref role="3cqZAo" node="3IIf9O_tkBA" resolve="node" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="3IIf9O_tnn$" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="3IIf9O_tnn_" role="3clFbw">
-            <node concept="10Nm6u" id="3IIf9O_tnnA" role="3uHU7w" />
-            <node concept="37vLTw" id="3IIf9O_tnnB" role="3uHU7B">
-              <ref role="3cqZAo" node="3IIf9O_tnmO" resolve="typesCache" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9O_tnnC" role="3cqZAp">
-          <node concept="10Nm6u" id="3IIf9O_tnnD" role="3clFbG" />
-        </node>
-      </node>
-      <node concept="P$JXv" id="3IIf9O_tpzW" role="lGtFl">
-        <node concept="TZ5HA" id="3IIf9O_tpzX" role="TZ5H$">
-          <node concept="1dT_AC" id="3IIf9O_tpzY" role="1dT_Ay">
-            <property role="1dT_AB" value="Must be called in a read action." />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OA6IYd" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
-      <property role="TrG5h" value="calcIsSubtype" />
-      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
-        <property role="TrG5h" value="subtype" />
-        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
-        <property role="TrG5h" value="supertype" />
-        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
-      <node concept="3Tm1VV" id="3IIf9OAgpFW" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
-        <node concept="3SKdUt" id="3IIf9OAgsqm" role="3cqZAp">
-          <node concept="3SKdUq" id="3IIf9OAgsqn" role="3SKWNk">
-            <property role="3SKdUp" value="ensure we can read the model" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="3IIf9OAgsqo" role="3cqZAp">
-          <node concept="2OqwBi" id="3IIf9OAgsqp" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9OAgsqq" role="2Oq$k0">
-              <node concept="37vLTw" id="3IIf9OAgsqr" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-              <node concept="liA8E" id="3IIf9OAgsqs" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="3IIf9OAgsqt" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9OAgszp" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9OAm07j" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAm07k" role="3cpWs9">
-            <property role="TrG5h" value="nodes" />
-            <node concept="_YKpA" id="3IIf9OAm07d" role="1tU5fm">
-              <node concept="3Tqbb2" id="3IIf9OAm07g" role="_ZDj9" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAm07l" role="33vP2m">
-              <node concept="Tc6Ow" id="3IIf9OAm07m" role="2ShVmc">
-                <node concept="3Tqbb2" id="3IIf9OAm07n" role="HW$YZ" />
-                <node concept="37vLTw" id="3IIf9OAm07o" role="HW$Y0">
-                  <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="subtype" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAm07p" role="HW$Y0">
-                  <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="supertype" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9OAgt3E" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgt3F" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="3IIf9OAgt3G" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAgt3H" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgt3I" role="2ShVmc">
-                <ref role="37wK5l" node="7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="37vLTw" id="3IIf9OAm07q" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAgt3L" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-                <node concept="1rXfSq" id="3IIf9OAgtip" role="37wK5m">
-                  <ref role="37wK5l" node="3IIf9OA6Owz" resolve="subtypeofQueryFqName" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9OAgt3M" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgt3N" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="3IIf9OAgt3O" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAgt3P" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgt3Q" role="2ShVmc">
-                <ref role="37wK5l" node="3IIf9OAgFCl" resolve="EvaluateRulesStep" />
-                <node concept="37vLTw" id="3IIf9OAgt3R" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAm0Wh" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAm07k" resolve="nodes" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9OAgszz" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="3IIf9OAgvDM" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9OAgvDN" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9OAgvDO" role="2ShVmc">
-                <ref role="37wK5l" node="443LGHBiDEV" resolve="TypecheckingHelper" />
-                <node concept="37vLTw" id="3IIf9OAgvDP" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgt3F" resolve="applyTemplatesStep" />
-                </node>
-                <node concept="37vLTw" id="3IIf9OAgvDQ" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9OAgt3N" resolve="evaluateRulesStep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9OAgx7T" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgx7U" role="3cpWs9">
-            <property role="TrG5h" value="lastStep" />
-            <node concept="3uibUv" id="3IIf9OAgx74" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-              <node concept="3qTvmN" id="3IIf9OAgx77" role="11_B2D" />
-            </node>
-            <node concept="2OqwBi" id="3IIf9OAgx7V" role="33vP2m">
-              <node concept="2OqwBi" id="3IIf9OAgx7W" role="2Oq$k0">
-                <node concept="37vLTw" id="3IIf9OAgx7X" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="3IIf9OAgx7Y" role="2OqNvi">
-                  <ref role="37wK5l" node="2mbQB8J5m$l" resolve="scheduleExecute" />
-                  <node concept="2YIFZM" id="3IIf9OAgx7Z" role="37wK5m">
-                    <ref role="1Pybhc" node="3KwBCAA_ela" resolve="TypecheckingSchedulers" />
-                    <ref role="37wK5l" node="3KwBCAA_erO" resolve="blocking" />
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9OAgsHG" role="3cqZAp" />
-        <node concept="3clFbF" id="3IIf9OAgsGa" role="3cqZAp">
-          <node concept="3clFbT" id="3IIf9OAgsG9" role="3clFbG">
-            <property role="3clFbU" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OAgpnk" role="jymVt" />
-    <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
-      <node concept="37vLTG" id="3IIf9O_u8h8" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9O_u8ki" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7kaxm0sEBCp" role="3clF45" />
-      <node concept="3Tmbuc" id="3IIf9O_Zcfj" role="1B3o_S" />
-      <node concept="3clFbS" id="7kaxm0sEBCr" role="3clF47">
-        <node concept="3clFbF" id="3IIf9O_u8qZ" role="3cqZAp">
-          <node concept="37vLTI" id="3IIf9O_u8r1" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9O_u8KX" role="37vLTJ">
-              <node concept="Xjq3P" id="3IIf9O_u8Pt" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3IIf9O_u8L0" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3IIf9O_u8r5" role="37vLTx">
-              <ref role="3cqZAo" node="3IIf9O_u8h8" resolve="repository" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9O_qYyg" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OA6IDE" role="jymVt">
-      <property role="TrG5h" value="typecheckQueryFqName" />
-      <node concept="3Tm6S6" id="3IIf9OA6IDF" role="1B3o_S" />
-      <node concept="17QB3L" id="3IIf9OA6IDG" role="3clF45" />
-      <node concept="3clFbS" id="3IIf9OA6IDa" role="3clF47">
-        <node concept="3SKdUt" id="6d0cWF2SWTd" role="3cqZAp">
-          <node concept="3SKdUq" id="6d0cWF2SWTe" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="6d0cWF2T1fj" role="3cqZAp">
-          <node concept="Xl_RD" id="6d0cWF2T1Gs" role="3clFbG">
-            <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OA6OQx" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OA6Owz" role="jymVt">
-      <property role="TrG5h" value="subtypeofQueryFqName" />
-      <node concept="3Tm6S6" id="3IIf9OA6Ow$" role="1B3o_S" />
-      <node concept="17QB3L" id="3IIf9OA6Ow_" role="3clF45" />
-      <node concept="3clFbS" id="3IIf9OA6OwA" role="3clF47">
-        <node concept="3SKdUt" id="6d0cWF2T25z" role="3cqZAp">
-          <node concept="3SKdUq" id="6d0cWF2T25$" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="6d0cWF2T25_" role="3cqZAp">
-          <node concept="Xl_RD" id="6d0cWF2T25A" role="3clFbG">
-            <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.subtypeOf" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3IIf9OA6CY1" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9O_qVvl" role="jymVt">
-      <property role="TrG5h" value="calcTypecheckingCache" />
-      <node concept="3Tm6S6" id="3IIf9O_qVvm" role="1B3o_S" />
-      <node concept="3uibUv" id="3IIf9O_qZis" role="3clF45">
-        <ref role="3uigEE" node="6QH_LDtcxgf" resolve="ModelTypeCache" />
-      </node>
-      <node concept="37vLTG" id="3IIf9O_r1EB" role="3clF46">
-        <property role="TrG5h" value="queryFqName" />
-        <node concept="17QB3L" id="3IIf9O_r2ob" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3IIf9O_qVvb" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9O_qVvc" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3IIf9O_qVvd" role="3clF46">
-        <property role="TrG5h" value="nodes" />
-        <node concept="2I9FWS" id="3IIf9O_rcZS" role="1tU5fm" />
-      </node>
-      <node concept="3clFbS" id="3IIf9O_qVt_" role="3clF47">
-        <node concept="3cpWs8" id="3IIf9O_qVtA" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtB" role="3cpWs9">
-            <property role="TrG5h" value="newCache" />
-            <node concept="3uibUv" id="3IIf9O_qVtC" role="1tU5fm">
-              <ref role="3uigEE" node="6QH_LDtcxgf" resolve="ModelTypeCache" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtD" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtE" role="2ShVmc">
-                <ref role="37wK5l" node="6QH_LDtcxgh" resolve="ModelTypeCache" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_qVtF" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9O_qVtG" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtH" role="3cpWs9">
-            <property role="TrG5h" value="applyTemplatesStep" />
-            <node concept="3uibUv" id="3IIf9O_qVtI" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lAwc0" resolve="ApplyTemplatesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtJ" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtK" role="2ShVmc">
-                <ref role="37wK5l" node="7WKNeR9fh8j" resolve="ApplyTemplatesStep" />
-                <node concept="37vLTw" id="3IIf9O_qVvh" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvd" resolve="nodes" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVvf" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_rfQn" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_r1EB" resolve="queryFqName" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9O_qVtN" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtO" role="3cpWs9">
-            <property role="TrG5h" value="evaluateRulesStep" />
-            <property role="3TUv4t" value="false" />
-            <node concept="3uibUv" id="3IIf9O_qVtP" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtQ" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtR" role="2ShVmc">
-                <ref role="37wK5l" node="1pPth$lHpLU" resolve="EvaluateRulesStep" />
-                <node concept="37vLTw" id="3IIf9O_qVvg" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9O_qVtT" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVtU" role="3cpWs9">
-            <property role="TrG5h" value="collectTypesStep" />
-            <node concept="3uibUv" id="3IIf9O_qVtV" role="1tU5fm">
-              <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVtW" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVtX" role="2ShVmc">
-                <ref role="37wK5l" node="6IQb_RxlCdT" resolve="CollectTypesStep" />
-                <node concept="37vLTw" id="3IIf9O_qVvi" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVvb" resolve="repository" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="3IIf9O_qVtZ" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVu0" role="3cpWs9">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="3IIf9O_qVu1" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$l_TFV" resolve="TypecheckingHelper" />
-            </node>
-            <node concept="2ShNRf" id="3IIf9O_qVu2" role="33vP2m">
-              <node concept="1pGfFk" id="3IIf9O_qVu3" role="2ShVmc">
-                <ref role="37wK5l" node="443LGHBiDEV" resolve="TypecheckingHelper" />
-                <node concept="37vLTw" id="3IIf9O_qVu4" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVtH" resolve="applyTemplatesStep" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVu5" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVtO" resolve="evaluateRulesStep" />
-                </node>
-                <node concept="37vLTw" id="3IIf9O_qVu6" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_qVtU" resolve="collectTypesStep" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_qVu7" role="3cqZAp" />
-        <node concept="3cpWs8" id="3IIf9O_qVu8" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9O_qVu9" role="3cpWs9">
-            <property role="TrG5h" value="lastStep" />
-            <node concept="3uibUv" id="3IIf9O_qVua" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
-              <node concept="3qTvmN" id="3IIf9O_qVub" role="11_B2D" />
-            </node>
-            <node concept="2OqwBi" id="3IIf9O_qVuc" role="33vP2m">
-              <node concept="2OqwBi" id="3IIf9O_qVud" role="2Oq$k0">
-                <node concept="37vLTw" id="3IIf9O_qVue" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3IIf9O_qVu0" resolve="helper" />
-                </node>
-                <node concept="liA8E" id="3IIf9O_qVuf" role="2OqNvi">
-                  <ref role="37wK5l" node="2mbQB8J5m$l" resolve="scheduleExecute" />
-                  <node concept="2YIFZM" id="3IIf9O_qVug" role="37wK5m">
-                    <ref role="1Pybhc" node="3KwBCAA_ela" resolve="TypecheckingSchedulers" />
-                    <ref role="37wK5l" node="3KwBCAA_erO" resolve="blocking" />
-                  </node>
-                </node>
-              </node>
-              <node concept="liA8E" id="3IIf9O_qVuh" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_qVui" role="3cqZAp" />
-        <node concept="3clFbJ" id="3IIf9O_qVuj" role="3cqZAp">
-          <node concept="3clFbS" id="3IIf9O_qVuk" role="3clFbx">
-            <node concept="3cpWs8" id="3IIf9O_qVul" role="3cqZAp">
-              <node concept="3cpWsn" id="3IIf9O_qVum" role="3cpWs9">
-                <property role="TrG5h" value="typesModelOwner" />
-                <node concept="3uibUv" id="3IIf9O_qVun" role="1tU5fm">
-                  <ref role="3uigEE" to="qox2:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
-                </node>
-                <node concept="2OqwBi" id="3IIf9O_qVuo" role="33vP2m">
-                  <node concept="1eOMI4" id="3IIf9O_qVup" role="2Oq$k0">
-                    <node concept="10QFUN" id="3IIf9O_qVuq" role="1eOMHV">
-                      <node concept="3uibUv" id="3IIf9O_qVur" role="10QFUM">
-                        <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
-                      </node>
-                      <node concept="37vLTw" id="3IIf9O_qVus" role="10QFUP">
-                        <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3IIf9O_qVut" role="2OqNvi">
-                    <ref role="37wK5l" node="443LGHBQB8e" resolve="getTypesModelOwner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="3IIf9O_qVuu" role="3cqZAp">
-              <node concept="2OqwBi" id="3IIf9O_qVuv" role="3clFbG">
-                <node concept="37vLTw" id="3IIf9O_qVuw" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3IIf9O_qVum" resolve="typesModelOwner" />
-                </node>
-                <node concept="liA8E" id="3IIf9O_qVux" role="2OqNvi">
-                  <ref role="37wK5l" to="qox2:2zU3cYq$eDA" resolve="unregister" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="3IIf9O_qVuy" role="3cqZAp">
-              <node concept="2OqwBi" id="3IIf9O_qVuz" role="3clFbG">
-                <node concept="37vLTw" id="3IIf9O_qVu$" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
-                </node>
-                <node concept="liA8E" id="3IIf9O_qVu_" role="2OqNvi">
-                  <ref role="37wK5l" node="6QH_LDtcxgx" resolve="setTypesModel" />
-                  <node concept="37vLTw" id="3IIf9O_qVuA" role="37wK5m">
-                    <ref role="3cqZAo" node="3IIf9O_qVum" resolve="typesModelOwner" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWs8" id="3IIf9O_qVuB" role="3cqZAp">
-              <node concept="3cpWsn" id="3IIf9O_qVuC" role="3cpWs9">
-                <property role="TrG5h" value="typeNodes" />
-                <node concept="3rvAFt" id="3IIf9O_qVuD" role="1tU5fm">
-                  <node concept="3Tqbb2" id="3IIf9O_qVuE" role="3rvSg0" />
-                  <node concept="3uibUv" id="3IIf9O_qVuF" role="3rvQeY">
-                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="3IIf9O_qVuG" role="33vP2m">
-                  <node concept="1eOMI4" id="3IIf9O_qVuH" role="2Oq$k0">
-                    <node concept="10QFUN" id="3IIf9O_qVuI" role="1eOMHV">
-                      <node concept="3uibUv" id="3IIf9O_qVuJ" role="10QFUM">
-                        <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
-                      </node>
-                      <node concept="37vLTw" id="3IIf9O_qVuK" role="10QFUP">
-                        <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="3IIf9O_qVuL" role="2OqNvi">
-                    <ref role="37wK5l" node="6IQb_RxlNhw" resolve="getTypeNodes" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1DcWWT" id="3IIf9O_qVuM" role="3cqZAp">
-              <node concept="3clFbS" id="3IIf9O_qVuN" role="2LFqv$">
-                <node concept="3clFbF" id="3IIf9O_qVuO" role="3cqZAp">
-                  <node concept="2OqwBi" id="3IIf9O_qVuP" role="3clFbG">
-                    <node concept="37vLTw" id="3IIf9O_qVuQ" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
-                    </node>
-                    <node concept="liA8E" id="3IIf9O_qVuR" role="2OqNvi">
-                      <ref role="37wK5l" node="6QH_LDtcYUC" resolve="putType" />
-                      <node concept="2OqwBi" id="3IIf9O_qVuS" role="37wK5m">
-                        <node concept="37vLTw" id="3IIf9O_qVuT" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3IIf9O_qVuY" resolve="m" />
-                        </node>
-                        <node concept="3AY5_j" id="3IIf9O_qVuU" role="2OqNvi" />
-                      </node>
-                      <node concept="2OqwBi" id="3IIf9O_qVuV" role="37wK5m">
-                        <node concept="37vLTw" id="3IIf9O_qVuW" role="2Oq$k0">
-                          <ref role="3cqZAo" node="3IIf9O_qVuY" resolve="m" />
-                        </node>
-                        <node concept="3AV6Ez" id="3IIf9O_qVuX" role="2OqNvi" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWsn" id="3IIf9O_qVuY" role="1Duv9x">
-                <property role="TrG5h" value="m" />
-                <node concept="3f3tKP" id="3IIf9O_qVuZ" role="1tU5fm">
-                  <node concept="3uibUv" id="3IIf9O_qVv0" role="3f3zw5">
-                    <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                  </node>
-                  <node concept="3Tqbb2" id="3IIf9O_qVv1" role="3f3$T$" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="3IIf9O_qVv2" role="1DdaDG">
-                <node concept="37vLTw" id="3IIf9O_qVv3" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3IIf9O_qVuC" resolve="typeNodes" />
-                </node>
-                <node concept="3CFNJx" id="3IIf9O_qVv4" role="2OqNvi" />
-              </node>
-            </node>
-          </node>
-          <node concept="2ZW3vV" id="3IIf9O_qVv5" role="3clFbw">
-            <node concept="3uibUv" id="3IIf9O_qVv6" role="2ZW6by">
-              <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
-            </node>
-            <node concept="37vLTw" id="3IIf9O_qVv7" role="2ZW6bz">
-              <ref role="3cqZAo" node="3IIf9O_qVu9" resolve="lastStep" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3IIf9O_qVv8" role="3cqZAp" />
-        <node concept="3clFbF" id="3IIf9O_qVv9" role="3cqZAp">
-          <node concept="37vLTw" id="3IIf9O_qVva" role="3clFbG">
-            <ref role="3cqZAo" node="3IIf9O_qVtB" resolve="newCache" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6QH_LDtaCb7" role="jymVt" />
-    <node concept="3Tm1VV" id="7kaxm0sEy3f" role="1B3o_S" />
-    <node concept="312cEg" id="3IIf9O_u8qV" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <node concept="3Tm6S6" id="3IIf9O_u8qW" role="1B3o_S" />
-      <node concept="3uibUv" id="3IIf9O_u8qY" role="1tU5fm">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-    </node>
-  </node>
   <node concept="312cEu" id="1pPth$l_TFV">
     <property role="TrG5h" value="TypecheckingHelper" />
     <property role="1sVAO0" value="false" />
@@ -4383,16 +3520,33 @@
       <node concept="3cqZAl" id="7WKNeR9fh8k" role="3clF45" />
       <node concept="3Tm1VV" id="7WKNeR9fh8l" role="1B3o_S" />
       <node concept="3clFbS" id="7WKNeR9fh8m" role="3clF47">
+        <node concept="3clFbJ" id="2Mi2iz0WFjM" role="3cqZAp">
+          <node concept="3clFbS" id="2Mi2iz0WFjO" role="3clFbx">
+            <node concept="YS8fn" id="2Mi2iz0WG2w" role="3cqZAp">
+              <node concept="2ShNRf" id="2Mi2iz0WG75" role="YScLw">
+                <node concept="1pGfFk" id="2Mi2iz0WINh" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~NullPointerException.&lt;init&gt;()" resolve="NullPointerException" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="2Mi2iz0WFSm" role="3clFbw">
+            <node concept="10Nm6u" id="2Mi2iz0WFWG" role="3uHU7w" />
+            <node concept="37vLTw" id="2Mi2iz0WFDW" role="3uHU7B">
+              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7WKNeR9fkhk" role="3cqZAp">
           <node concept="37vLTI" id="7WKNeR9fkhl" role="3clFbG">
             <node concept="2OqwBi" id="7WKNeR9fkhm" role="37vLTJ">
               <node concept="Xjq3P" id="7WKNeR9fkhn" role="2Oq$k0" />
               <node concept="2OwXpG" id="7WKNeR9fkho" role="2OqNvi">
-                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryFqName" />
+                <ref role="2Oxat5" node="7WKNeR9fj4f" resolve="queryKind" />
               </node>
             </node>
             <node concept="37vLTw" id="7WKNeR9fkhp" role="37vLTx">
-              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryFqName" />
+              <ref role="3cqZAo" node="7WKNeR9fiNv" resolve="queryKind" />
             </node>
           </node>
         </node>
@@ -4447,8 +3601,10 @@
         </node>
       </node>
       <node concept="37vLTG" id="7WKNeR9fiNv" role="3clF46">
-        <property role="TrG5h" value="queryFqName" />
-        <node concept="17QB3L" id="7WKNeR9fiNw" role="1tU5fm" />
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="2Mi2iz0OrrK" role="1tU5fm">
+          <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
       </node>
       <node concept="37vLTG" id="6OXbTDxI9hi" role="3clF46">
         <property role="TrG5h" value="queryParameter" />
@@ -4657,7 +3813,7 @@
                               <node concept="3y3z36" id="7WKNeR9kv7M" role="3K4Cdx">
                                 <node concept="10Nm6u" id="7WKNeR9kv7N" role="3uHU7w" />
                                 <node concept="37vLTw" id="7WKNeR9kv7O" role="3uHU7B">
-                                  <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryFqName" />
+                                  <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
                                 </node>
                               </node>
                               <node concept="2OqwBi" id="7WKNeR9kv7P" role="3K4E3e">
@@ -4670,9 +3826,9 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="7WKNeR9kv7T" role="2OqNvi">
-                                  <ref role="37wK5l" to="hano:7WKNeR95RPZ" resolve="byFqName" />
+                                  <ref role="37wK5l" to="hano:4t7Xo7inmSj" resolve="byKind" />
                                   <node concept="37vLTw" id="7WKNeR9kv7U" role="37wK5m">
-                                    <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryFqName" />
+                                    <ref role="3cqZAo" node="7WKNeR9fj4f" resolve="queryKind" />
                                   </node>
                                 </node>
                               </node>
@@ -4913,9 +4069,11 @@
       </node>
     </node>
     <node concept="312cEg" id="7WKNeR9fj4f" role="jymVt">
-      <property role="TrG5h" value="queryFqName" />
+      <property role="TrG5h" value="queryKind" />
       <node concept="3Tm6S6" id="7WKNeR9fj4g" role="1B3o_S" />
-      <node concept="17QB3L" id="7WKNeR9fj4i" role="1tU5fm" />
+      <node concept="3uibUv" id="2Mi2iz0OrBG" role="1tU5fm">
+        <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+      </node>
     </node>
     <node concept="312cEg" id="6OXbTDxIg00" role="jymVt">
       <property role="TrG5h" value="queryParameter" />
@@ -6075,22 +5233,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6OXbTD_AGUa" role="3cqZAp" />
-        <node concept="3SKdUt" id="6OXbTD_AKjZ" role="3cqZAp">
-          <node concept="3SKdUq" id="6OXbTD_AKk1" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: refactor into an extension point to avoid having to hardcode fqname" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="6OXbTD_A30I" role="3cqZAp">
-          <node concept="3cpWsn" id="6OXbTD_A30J" role="3cpWs9">
-            <property role="TrG5h" value="queryFqname" />
-            <node concept="17QB3L" id="6OXbTD_A30G" role="1tU5fm" />
-            <node concept="Xl_RD" id="6OXbTD_AFOY" role="33vP2m">
-              <property role="Xl_RC" value="jetbrains.mps.baseLanguageExt.types.typecheck" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="6OXbTD__XSd" role="3cqZAp" />
         <node concept="3cpWs8" id="7y50OW6XU81" role="3cqZAp">
           <node concept="3cpWsn" id="7y50OW6XU82" role="3cpWs9">
             <property role="TrG5h" value="helper" />
@@ -6111,8 +5253,9 @@
               <node concept="37vLTw" id="2Qe6u2c7U1o" role="37wK5m">
                 <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
               </node>
-              <node concept="37vLTw" id="6OXbTD_A8RK" role="37wK5m">
-                <ref role="3cqZAo" node="6OXbTD_A30J" resolve="queryFqname" />
+              <node concept="10M0yZ" id="2Mi2iz0PU3D" role="37wK5m">
+                <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+                <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
               </node>
             </node>
           </node>
@@ -6258,8 +5401,9 @@
                                     <node concept="37vLTw" id="2Qe6u2c8hlW" role="37wK5m">
                                       <ref role="3cqZAo" node="443LGHBTRnR" resolve="repository" />
                                     </node>
-                                    <node concept="37vLTw" id="6OXbTD_A9ie" role="37wK5m">
-                                      <ref role="3cqZAo" node="6OXbTD_A30J" resolve="queryFqname" />
+                                    <node concept="10M0yZ" id="2Mi2iz0PV09" role="37wK5m">
+                                      <ref role="3cqZAo" to="1g4i:4t7Xo7inNvw" resolve="TYPECHECK" />
+                                      <ref role="1PxDUh" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
                                     </node>
                                   </node>
                                   <node concept="37vLTw" id="2Qe6u2c9dcK" role="37vLTJ">
@@ -6623,8 +5767,10 @@
         </node>
       </node>
       <node concept="37vLTG" id="6OXbTD_A4DJ" role="3clF46">
-        <property role="TrG5h" value="queryFqname" />
-        <node concept="17QB3L" id="6OXbTD_A53L" role="1tU5fm" />
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="2Mi2iz0OAqg" role="1tU5fm">
+          <ref role="3uigEE" to="1g4i:4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+        </node>
       </node>
       <node concept="3clFbS" id="2Qe6u2c8aJA" role="3clF47">
         <node concept="3cpWs8" id="2Qe6u2c8aJB" role="3cqZAp">
@@ -6643,7 +5789,7 @@
                   <ref role="3cqZAo" node="2Qe6u2c8aJ$" resolve="repository" />
                 </node>
                 <node concept="37vLTw" id="6OXbTD_A6xQ" role="37wK5m">
-                  <ref role="3cqZAo" node="6OXbTD_A4DJ" resolve="queryFqname" />
+                  <ref role="3cqZAo" node="6OXbTD_A4DJ" resolve="queryKind" />
                 </node>
               </node>
             </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template/main@generator.mps
index 06d70ff2..531d8764 100644
--- a/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/template/main@generator.mps
@@ -79,7 +79,7 @@
         <node concept="3clFbS" id="3IIf9O_EzTq" role="1Koe22">
           <node concept="3clFbF" id="3IIf9O_E_tv" role="3cqZAp">
             <node concept="1niqFM" id="3IIf9O_E_tt" role="3clFbG">
-              <property role="1npUBZ" value="jetbrains.mps.typechecking.service.TypecheckingFacade" />
+              <property role="1npUBZ" value="jetbrains.mps.typechecking.TypecheckingFacade" />
               <property role="1npL6y" value="typeOf" />
               <node concept="10Nm6u" id="3IIf9O_E_u8" role="2U24H$">
                 <node concept="29HgVG" id="3IIf9O_E_u9" role="lGtFl">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 6683cc01..5322f88b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -54,8 +54,10 @@
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.typesystem2.program)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
+    <import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
+    <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" />
+    <import index="1g4i" ref="r:102178da-67ba-49f6-ba73-eb29fa352fe7(jetbrains.mps.typechecking)" />
     <import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
-    <import index="hypd" ref="r:aa31e43e-9240-4f4d-b6db-5c1c9a86c59e(jetbrains.mps.lang.project.structure)" implicit="true" />
     <import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" implicit="true" />
   </imports>
   <registry>
@@ -20851,6 +20853,39 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6OXbTD$fBKv" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7icnxD" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="kind" />
+      <node concept="3Tm1VV" id="4t7Xo7icnxF" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7insnx" role="3clF45">
+        <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+      </node>
+      <node concept="3clFbS" id="4t7Xo7icnxH" role="3clF47">
+        <node concept="3clFbF" id="2BZXJecG5i6" role="3cqZAp">
+          <node concept="10Nm6u" id="2BZXJecG5i5" role="3clFbG">
+            <node concept="29HgVG" id="2BZXJecG5iA" role="lGtFl">
+              <node concept="3NFfHV" id="2BZXJecG5iQ" role="3NFExx">
+                <node concept="3clFbS" id="2BZXJecG5iR" role="2VODD2">
+                  <node concept="3clFbF" id="2BZXJecG5mX" role="3cqZAp">
+                    <node concept="2OqwBi" id="2BZXJecG5xy" role="3clFbG">
+                      <node concept="30H73N" id="2BZXJecG5mW" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="2BZXJecG6x1" role="2OqNvi">
+                        <ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4t7Xo7icnxI" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7icolH" role="jymVt" />
     <node concept="3clFb_" id="6OXbTD$jihG" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="usedHandlersFqNames" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
index f4cbc7a8..0f6813e4 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl
@@ -27,6 +27,8 @@
         <dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
         <dependency reexport="false">df345b11-b8c7-4213-ac66-48d2a9b75d88(jetbrains.mps.baseLanguageInternal)</dependency>
         <dependency reexport="false">96ee7a94-411d-4cf8-9b94-96cad7e52411(jetbrains.mps.baseLanguage.jdk7)</dependency>
+        <dependency reexport="false">86ef8290-12bb-4ca7-947f-093788f263a9(jetbrains.mps.lang.project)</dependency>
+        <dependency reexport="false">6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)</dependency>
       </dependencies>
       <languageVersions>
         <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -74,6 +76,7 @@
         <module reference="f4ad079d-bc71-4ffb-9600-9328705cf998(jetbrains.mps.lang.descriptor)" version="0" />
         <module reference="3ac18869-0828-4401-abad-822a47bf83f1(jetbrains.mps.lang.descriptor#9020561928507175817)" version="0" />
         <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="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
         <module reference="c4803b19-6d89-4a3b-bf82-390769514add(jetbrains.mps.lang.typesystem2)" version="0" />
@@ -84,6 +87,7 @@
         <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="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
         <module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.typechecking.reporting)" version="0" />
       </dependencyVersions>
       <mapping-priorities />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index a820cc49..c100ee10 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -6808,26 +6808,26 @@
   <node concept="24kQdi" id="7P_FdVQ_S6G">
     <ref role="1XX52x" to="wq2x:7P_FdVQ_S6B" resolve="QueryTemplate" />
     <node concept="3EZMnI" id="7P_FdVQ_S6R" role="2wV5jI">
-      <node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-        <node concept="ljvvj" id="3IIf9O_dj_X" role="3F10Kt">
+      <node concept="3F0ifn" id="2BZXJecJG8q" role="3EZMnx">
+        <property role="3F0ifm" value="(" />
+        <node concept="11LMrY" id="2BZXJecKocH" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
-      <node concept="3F0ifn" id="6OXbTD$fGLE" role="3EZMnx">
-        <property role="3F0ifm" value="" />
-        <node concept="ljvvj" id="6OXbTD$fGLF" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
-      </node>
-      <node concept="3F0ifn" id="6OXbTD$fGJW" role="3EZMnx">
-        <property role="3F0ifm" value="stage:" />
-      </node>
       <node concept="3F0A7n" id="6OXbTD$fGKx" role="3EZMnx">
         <property role="1$x2rV" value="initial" />
         <property role="1O74Pk" value="true" />
         <ref role="1NtTu8" to="wq2x:6OXbTD$fGCg" resolve="stage" />
-        <node concept="ljvvj" id="6OXbTD$fGKI" role="3F10Kt">
+      </node>
+      <node concept="3F0ifn" id="2BZXJecJG9E" role="3EZMnx">
+        <property role="3F0ifm" value=")" />
+        <node concept="11L4FC" id="2BZXJecKocJ" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0A7n" id="7P_FdVQ_S77" role="3EZMnx">
+        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
+        <node concept="ljvvj" id="2BZXJecJGb_" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
@@ -6852,12 +6852,30 @@
   <node concept="24kQdi" id="6OXbTD$dU7D">
     <ref role="1XX52x" to="wq2x:6OXbTD$dU7b" resolve="Query" />
     <node concept="3EZMnI" id="6OXbTD$dU7F" role="2wV5jI">
+      <node concept="3F0ifn" id="2BZXJecJG7U" role="3EZMnx">
+        <property role="3F0ifm" value="query" />
+      </node>
       <node concept="3F0A7n" id="6OXbTD$dU81" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <node concept="ljvvj" id="6OXbTD$dU8h" role="3F10Kt">
           <property role="VOm3f" value="true" />
         </node>
       </node>
+      <node concept="3F0ifn" id="2BZXJecEa_Y" role="3EZMnx">
+        <property role="3F0ifm" value="" />
+        <node concept="ljvvj" id="2BZXJecEa_Z" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F0ifn" id="2BZXJecEa_K" role="3EZMnx">
+        <property role="3F0ifm" value="kind:" />
+      </node>
+      <node concept="3F1sOY" id="2BZXJecEa_m" role="3EZMnx">
+        <ref role="1NtTu8" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
+        <node concept="ljvvj" id="2BZXJecEaAS" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
       <node concept="3F0ifn" id="6OXbTD$dU8b" role="3EZMnx">
         <property role="3F0ifm" value="" />
         <node concept="ljvvj" id="6OXbTD$dU8j" role="3F10Kt">
@@ -6867,6 +6885,9 @@
       <node concept="3F2HdR" id="6OXbTD$dU7M" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:6OXbTD$dU7c" resolve="queryStage" />
         <node concept="l2Vlx" id="6OXbTD$dU7O" role="2czzBx" />
+        <node concept="lj46D" id="2BZXJecJGc3" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
       </node>
       <node concept="l2Vlx" id="6OXbTD$dU7I" role="2iSdaV" />
     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/plugin.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/plugin.mps
index 7e416d02..914d707a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/plugin.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/plugin.mps
@@ -7,7 +7,10 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="2" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
-  <imports />
+  <imports>
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
+  </imports>
   <registry>
     <language id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect">
       <concept id="3433054418424672374" name="jetbrains.mps.lang.aspect.structure.SimpleLanguageAspectDescriptor" flags="ng" index="3vrhyV">
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index ea5a0914..14daede0 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1636,6 +1636,13 @@
     <property role="19KtqR" value="true" />
     <property role="34LRSv" value="query" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyj" id="2BZXJecE0bF" role="1TKVEi">
+      <property role="IQ2ns" value="3026409000513569515" />
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="queryKind" />
+      <property role="20lbJX" value="1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
     <node concept="1TJgyj" id="6OXbTD$dU7c" role="1TKVEi">
       <property role="IQ2ns" value="7871500063866331596" />
       <property role="20lmBu" value="aggregation" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
index d76fd98e..fedfd982 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/typesystem.mps
@@ -1688,5 +1688,36 @@
       <ref role="1YaFvo" to="wq2x:oI9Yrc9wC" resolve="SNodeSetTypeOperation" />
     </node>
   </node>
+  <node concept="1YbPZF" id="2BZXJecE0cj">
+    <property role="TrG5h" value="typeof_Query" />
+    <node concept="3clFbS" id="2BZXJecE0ck" role="18ibNy">
+      <node concept="1ZobV4" id="2BZXJecE0Nr" role="3cqZAp">
+        <property role="3wDh2S" value="true" />
+        <node concept="mw_s8" id="2BZXJecE0Oa" role="1ZfhKB">
+          <node concept="2c44tf" id="2BZXJecE0O6" role="mwGJk">
+            <node concept="3uibUv" id="2BZXJecE0Pl" role="2c44tc">
+              <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+            </node>
+          </node>
+        </node>
+        <node concept="mw_s8" id="2BZXJecE0Nu" role="1ZfhK$">
+          <node concept="1Z2H0r" id="2BZXJecE0cu" role="mwGJk">
+            <node concept="2OqwBi" id="2BZXJecE0n6" role="1Z2MuG">
+              <node concept="1YBJjd" id="2BZXJecE0eg" role="2Oq$k0">
+                <ref role="1YBMHb" node="2BZXJecE0cm" resolve="query" />
+              </node>
+              <node concept="3TrEf2" id="2BZXJecE0yD" role="2OqNvi">
+                <ref role="3Tt5mk" to="wq2x:2BZXJecE0bF" resolve="queryKind" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1YaCAy" id="2BZXJecE0cm" role="1YuTPh">
+      <property role="TrG5h" value="query" />
+      <ref role="1YaFvo" to="wq2x:6OXbTD$dU7b" resolve="Query" />
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
index 635a680d..b3bb27bc 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/models/jetbrains.mps.lang.typesystem2.evaluation.mps
@@ -12199,6 +12199,32 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7WKNeR98smD" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7inmSj" role="jymVt">
+      <property role="TrG5h" value="byKind" />
+      <node concept="37vLTG" id="4t7Xo7inmSk" role="3clF46">
+        <property role="TrG5h" value="queryKind" />
+        <node concept="3uibUv" id="4t7Xo7inyd1" role="1tU5fm">
+          <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="4t7Xo7inmSm" role="3clF45">
+        <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+      </node>
+      <node concept="3Tm1VV" id="4t7Xo7inmSn" role="1B3o_S" />
+      <node concept="3clFbS" id="4t7Xo7inmSo" role="3clF47">
+        <node concept="3clFbF" id="4t7Xo7inmSp" role="3cqZAp">
+          <node concept="3EllGN" id="4t7Xo7inmSq" role="3clFbG">
+            <node concept="37vLTw" id="4t7Xo7inmSr" role="3ElVtu">
+              <ref role="3cqZAo" node="4t7Xo7inmSk" resolve="queryKind" />
+            </node>
+            <node concept="37vLTw" id="4t7Xo7inzKG" role="3ElQJh">
+              <ref role="3cqZAo" node="4t7Xo7inyhm" resolve="kind2queryTemplate" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="4t7Xo7inmSi" role="jymVt" />
     <node concept="3clFb_" id="7WKNeR98sU4" role="jymVt">
       <property role="TrG5h" value="ruleTemplates" />
       <node concept="37vLTG" id="7WKNeR98uXx" role="3clF46">
@@ -12435,6 +12461,41 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbJ" id="4t7Xo7in$su" role="3cqZAp">
+              <node concept="3clFbS" id="4t7Xo7in$sw" role="3clFbx">
+                <node concept="3clFbF" id="4t7Xo7inGd8" role="3cqZAp">
+                  <node concept="37vLTI" id="4t7Xo7inJsK" role="3clFbG">
+                    <node concept="2GrUjf" id="4t7Xo7inMuK" role="37vLTx">
+                      <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                    </node>
+                    <node concept="3EllGN" id="4t7Xo7inGyT" role="37vLTJ">
+                      <node concept="2OqwBi" id="4t7Xo7inGHd" role="3ElVtu">
+                        <node concept="2GrUjf" id="4t7Xo7inG__" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                        </node>
+                        <node concept="liA8E" id="4t7Xo7inHtO" role="2OqNvi">
+                          <ref role="37wK5l" to="i348:4t7Xo7icmmF" resolve="kind" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="4t7Xo7inGd6" role="3ElQJh">
+                        <ref role="3cqZAo" node="4t7Xo7inyhm" resolve="kind2queryTemplate" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="4t7Xo7inBbP" role="3clFbw">
+                <node concept="10Nm6u" id="4t7Xo7inFzN" role="3uHU7w" />
+                <node concept="2OqwBi" id="4t7Xo7in_do" role="3uHU7B">
+                  <node concept="2GrUjf" id="4t7Xo7in_5Z" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="7WKNeR97wDT" resolve="qt" />
+                  </node>
+                  <node concept="liA8E" id="4t7Xo7in_W9" role="2OqNvi">
+                    <ref role="37wK5l" to="i348:4t7Xo7icmmF" resolve="kind" />
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3clFbH" id="6OXbTD$owiJ" role="3cqZAp" />
             <node concept="3cpWs8" id="7WKNeR97HMt" role="3cqZAp">
               <node concept="3cpWsn" id="7WKNeR97HMu" role="3cpWs9">
@@ -12700,6 +12761,28 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="4t7Xo7inyhm" role="jymVt">
+      <property role="TrG5h" value="kind2queryTemplate" />
+      <node concept="3Tm6S6" id="4t7Xo7inyhn" role="1B3o_S" />
+      <node concept="3rvAFt" id="4t7Xo7inyho" role="1tU5fm">
+        <node concept="3uibUv" id="4t7Xo7inzDS" role="3rvQeY">
+          <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+        </node>
+        <node concept="3uibUv" id="4t7Xo7inyhq" role="3rvSg0">
+          <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="4t7Xo7inyhr" role="33vP2m">
+        <node concept="3rGOSV" id="4t7Xo7inyhs" role="2ShVmc">
+          <node concept="3uibUv" id="4t7Xo7inzII" role="3rHrn6">
+            <ref role="3uigEE" to="i348:4t7Xo7inshN" resolve="QueryKind" />
+          </node>
+          <node concept="3uibUv" id="4t7Xo7inyhu" role="3rHtpV">
+            <ref role="3uigEE" to="i348:6OXbTD$iNPP" resolve="QueryTemplate" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="6OXbTD$nH5r" role="jymVt">
       <property role="TrG5h" value="queryTemplate2stage_templates" />
       <node concept="3Tm6S6" id="6OXbTD$nH5s" role="1B3o_S" />
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
index 6488b8a3..5f594d72 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/models/jetbrains.mps.lang.typesystem2.rule.mps
@@ -2051,6 +2051,17 @@
       <node concept="3Tm1VV" id="6OXbTD$iO0B" role="1B3o_S" />
       <node concept="3clFbS" id="6OXbTD$iO0C" role="3clF47" />
     </node>
+    <node concept="2tJIrI" id="4t7Xo7iclkP" role="jymVt" />
+    <node concept="3clFb_" id="4t7Xo7icmmF" role="jymVt">
+      <property role="1EzhhJ" value="true" />
+      <property role="2aFKle" value="false" />
+      <property role="TrG5h" value="kind" />
+      <node concept="3clFbS" id="4t7Xo7icmmI" role="3clF47" />
+      <node concept="3Tm1VV" id="4t7Xo7icmmJ" role="1B3o_S" />
+      <node concept="3uibUv" id="4t7Xo7intc6" role="3clF45">
+        <ref role="3uigEE" node="4t7Xo7inshN" resolve="QueryKind" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="6OXbTD$iO0D" role="jymVt" />
     <node concept="3clFb_" id="6OXbTD$iO0E" role="jymVt">
       <property role="1EzhhJ" value="true" />
@@ -2214,5 +2225,9 @@
       <node concept="3Tm1VV" id="7P_FdVQ_jCp" role="1B3o_S" />
     </node>
   </node>
+  <node concept="3HP615" id="4t7Xo7inshN">
+    <property role="TrG5h" value="QueryKind" />
+    <node concept="3Tm1VV" id="4t7Xo7inshO" role="1B3o_S" />
+  </node>
 </model>