From 4160c186e13a106a3eb4ed8835d9f2f867124c24 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 23 Oct 2019 15:39:17 +0200
Subject: [PATCH] Introduce dependency to Config in typechecking options and
 service. Avoid relying on static getInstance() method to access Config.

Config is an application-level "component" initialized from an application plugin.
All usages on application/project-level should declare explicit dependency on it.
Tests can either create a new instance or access the shared one.
---
 .../jetbrains.mps.coderules.plugin@tests.mps  | 104 +-
 ...ains.mps.coderules.typechecking.plugin.mps | 854 +++++++++--------
 ...ins.mps.coderules.typechecking.service.mps | 885 +++++++++++++-----
 .../jetbrains.mps.coderules/models/plugin.mps | 512 ++++++----
 4 files changed, 1473 insertions(+), 882 deletions(-)

diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps
index 86bad666..d2065681 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.plugin@tests.mps
@@ -14,6 +14,7 @@
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <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="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" />
@@ -32,6 +33,10 @@
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <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>
@@ -64,6 +69,12 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <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="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -72,6 +83,7 @@
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </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" />
     </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">
@@ -111,6 +123,18 @@
   </registry>
   <node concept="3s_ewN" id="7iCybvTtZhR">
     <property role="3s_ewP" value="Options" />
+    <node concept="2tJIrI" id="6hpwxwiHMWS" role="jymVt" />
+    <node concept="312cEg" id="6hpwxwiHN82" role="jymVt">
+      <property role="TrG5h" value="config" />
+      <node concept="3Tm6S6" id="6hpwxwiHN83" role="1B3o_S" />
+      <node concept="3uibUv" id="6hpwxwiHNaT" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+      </node>
+      <node concept="2YIFZM" id="6hpwxwiK0dQ" role="33vP2m">
+        <ref role="37wK5l" to="31yc:6hpwxwiHYr2" resolve="create" />
+        <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7iCybvTtZhS" role="1B3o_S" />
     <node concept="3s_gsd" id="7iCybvTtZhT" role="3s_ewO">
       <node concept="3s$Bmu" id="7iCybvTtZkQ" role="3s_gse">
@@ -120,9 +144,8 @@
         <node concept="3clFbS" id="7iCybvTtZkT" role="3clF47">
           <node concept="3clFbF" id="7iCybvTuN5t" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTuN9B" role="3clFbG">
-              <node concept="2YIFZM" id="7iCybvTuN6Z" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIbQi" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTuNei" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -170,9 +193,8 @@
               <property role="Xl_RC" value="foo" />
             </node>
             <node concept="2OqwBi" id="7iCybvTwvqW" role="3tpDZA">
-              <node concept="2YIFZM" id="7iCybvTwvqX" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIbTF" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwvqY" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -184,9 +206,8 @@
           </node>
           <node concept="3ykFI1" id="7iCybvTwvMo" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTu0uX" role="3ykU8v">
-              <node concept="2YIFZM" id="7iCybvTu0uY" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIc0C" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTu0uZ" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -198,9 +219,8 @@
           </node>
           <node concept="3ykFI1" id="7iCybvTwyqE" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTwyqF" role="3ykU8v">
-              <node concept="2YIFZM" id="7iCybvTwyqG" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIc2G" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwyqH" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -219,9 +239,8 @@
         <node concept="3clFbS" id="7iCybvTw$7H" role="3clF47">
           <node concept="3clFbF" id="7iCybvTw$7I" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTw$7J" role="3clFbG">
-              <node concept="2YIFZM" id="7iCybvTw$7K" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIc9v" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTw$7L" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -266,9 +285,8 @@
           <node concept="3clFbH" id="7iCybvTwD5t" role="3cqZAp" />
           <node concept="3ykFI1" id="7iCybvTwCSA" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTwCSB" role="3ykU8v">
-              <node concept="2YIFZM" id="7iCybvTwCSC" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIcf3" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwCSD" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -281,9 +299,8 @@
           <node concept="3clFbH" id="7iCybvTwCCP" role="3cqZAp" />
           <node concept="3clFbF" id="7iCybvTw$yQ" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTw$yR" role="3clFbG">
-              <node concept="2YIFZM" id="7iCybvTw$yS" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIcg_" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTw$yT" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -331,9 +348,8 @@
               <property role="Xl_RC" value="foo" />
             </node>
             <node concept="2OqwBi" id="7iCybvTw$84" role="3tpDZA">
-              <node concept="2YIFZM" id="7iCybvTw$85" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIckK" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTw$86" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -345,9 +361,8 @@
           </node>
           <node concept="3ykFI1" id="7iCybvTw$88" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTw$89" role="3ykU8v">
-              <node concept="2YIFZM" id="7iCybvTw$8a" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIcqL" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTw$8b" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -362,9 +377,8 @@
               <property role="Xl_RC" value="bar" />
             </node>
             <node concept="2OqwBi" id="7iCybvTw_jw" role="3tpDZA">
-              <node concept="2YIFZM" id="7iCybvTw_jx" role="2Oq$k0">
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <node concept="37vLTw" id="6hpwxwiIcsj" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTw_jy" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -383,9 +397,8 @@
         <node concept="3clFbS" id="7iCybvTwF0p" role="3clF47">
           <node concept="3clFbF" id="7iCybvTwFnq" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTwFnr" role="3clFbG">
-              <node concept="2YIFZM" id="7iCybvTwFns" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIcwm" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwFnt" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -433,9 +446,8 @@
               <property role="Xl_RC" value="foo" />
             </node>
             <node concept="2OqwBi" id="7iCybvTwFnK" role="3tpDZA">
-              <node concept="2YIFZM" id="7iCybvTwFnL" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIcBe" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwFnM" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -448,9 +460,8 @@
           <node concept="3clFbH" id="7iCybvTwFnf" role="3cqZAp" />
           <node concept="3clFbF" id="7iCybvTwFyv" role="3cqZAp">
             <node concept="2OqwBi" id="7iCybvTwFyw" role="3clFbG">
-              <node concept="2YIFZM" id="7iCybvTwFyx" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIcCS" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwFyy" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -498,9 +509,8 @@
               <property role="Xl_RC" value="bazz" />
             </node>
             <node concept="2OqwBi" id="7iCybvTwFyq" role="3tpDZA">
-              <node concept="2YIFZM" id="7iCybvTwFyr" role="2Oq$k0">
-                <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-                <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+              <node concept="37vLTw" id="6hpwxwiIcG_" role="2Oq$k0">
+                <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
               </node>
               <node concept="liA8E" id="7iCybvTwFys" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:7iCybvToiWV" resolve="getOption" />
@@ -518,9 +528,8 @@
       <node concept="3clFbS" id="7iCybvTuq8X" role="2VODD2">
         <node concept="3clFbF" id="xqbf82kUv5" role="3cqZAp">
           <node concept="2OqwBi" id="xqbf82kUBT" role="3clFbG">
-            <node concept="2YIFZM" id="xqbf82kUz3" role="2Oq$k0">
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            <node concept="37vLTw" id="6hpwxwiIbGZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
             </node>
             <node concept="liA8E" id="xqbf82kUJC" role="2OqNvi">
               <ref role="37wK5l" to="31yc:xqbf82kuzw" resolve="reset" />
@@ -537,9 +546,8 @@
       <node concept="3clFbS" id="7iCybvTuuHq" role="2VODD2">
         <node concept="3clFbF" id="xqbf82kUXr" role="3cqZAp">
           <node concept="2OqwBi" id="xqbf82kUXs" role="3clFbG">
-            <node concept="2YIFZM" id="xqbf82kUXt" role="2Oq$k0">
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            <node concept="37vLTw" id="6hpwxwiIbIN" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiHN82" resolve="config" />
             </node>
             <node concept="liA8E" id="xqbf82kUXu" role="2OqNvi">
               <ref role="37wK5l" to="31yc:xqbf82kuzw" resolve="reset" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 9321d023..94f394dc 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -171,9 +171,7 @@
         <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">
-        <property id="1240249534625" name="isVolatile" index="34CwA1" />
-      </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">
         <property id="1221565133444" name="isFinal" index="1EXbeo" />
         <child id="1095933932569" name="implementedInterface" index="EKbjA" />
@@ -262,11 +260,6 @@
         <child id="1170075728144" name="expression" index="1HWFw0" />
         <child id="1170075736412" name="block" index="1HWHxc" />
       </concept>
-      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
-        <child id="1163668914799" name="condition" index="3K4Cdx" />
-        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
-        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
@@ -402,23 +395,26 @@
   <node concept="312cEu" id="7Tj_ODDR37X">
     <property role="TrG5h" value="CoderulesTypecheckingProvider" />
     <node concept="2tJIrI" id="3LFq2p98DGJ" role="jymVt" />
-    <node concept="Wx3nA" id="3KN3A4w8XqJ" role="jymVt">
-      <property role="TrG5h" value="INSTANCE" />
-      <node concept="3uibUv" id="3KN3A4w8WSs" role="1tU5fm">
-        <ref role="3uigEE" node="7Tj_ODDR37X" resolve="CoderulesTypecheckingProvider" />
-      </node>
-      <node concept="3Tm6S6" id="3KN3A4w8W3C" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="3KN3A4w93ML" role="jymVt" />
     <node concept="3clFbW" id="3LFq2p98DNK" role="jymVt">
+      <node concept="37vLTG" id="2tFDlV2dRYj" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="2tFDlV2dSvR" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="3LFq2p98DNM" role="3clF45" />
       <node concept="3Tm1VV" id="3LFq2p98DNN" role="1B3o_S" />
       <node concept="3clFbS" id="3LFq2p98DNO" role="3clF47">
-        <node concept="3clFbF" id="3KN3A4w97kn" role="3cqZAp">
-          <node concept="37vLTI" id="3KN3A4w97Fj" role="3clFbG">
-            <node concept="Xjq3P" id="3KN3A4w97MG" role="37vLTx" />
-            <node concept="37vLTw" id="3KN3A4w97kl" role="37vLTJ">
-              <ref role="3cqZAo" node="3KN3A4w8XqJ" resolve="INSTANCE" />
+        <node concept="3clFbF" id="6hpwxwirfrx" role="3cqZAp">
+          <node concept="37vLTI" id="6hpwxwirfrz" role="3clFbG">
+            <node concept="2OqwBi" id="6hpwxwirhVy" role="37vLTJ">
+              <node concept="Xjq3P" id="6hpwxwiri4r" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6hpwxwirhV_" role="2OqNvi">
+                <ref role="2Oxat5" node="6hpwxwirfrt" resolve="config" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6hpwxwirfrB" role="37vLTx">
+              <ref role="3cqZAo" node="2tFDlV2dRYj" resolve="config" />
             </node>
           </node>
         </node>
@@ -430,11 +426,14 @@
       <node concept="3cqZAl" id="3KN3A4w9alr" role="3clF45" />
       <node concept="3Tm1VV" id="3KN3A4w9als" role="1B3o_S" />
       <node concept="3clFbS" id="3KN3A4w9alt" role="3clF47">
-        <node concept="3clFbF" id="3KN3A4w9bXY" role="3cqZAp">
-          <node concept="37vLTI" id="3KN3A4w9cl7" role="3clFbG">
-            <node concept="10Nm6u" id="3KN3A4w9csw" role="37vLTx" />
-            <node concept="37vLTw" id="3KN3A4w9bXX" role="37vLTJ">
-              <ref role="3cqZAo" node="3KN3A4w8XqJ" resolve="INSTANCE" />
+        <node concept="3clFbF" id="6hpwxwiriGb" role="3cqZAp">
+          <node concept="37vLTI" id="6hpwxwirju9" role="3clFbG">
+            <node concept="10Nm6u" id="6hpwxwirjBW" role="37vLTx" />
+            <node concept="2OqwBi" id="6hpwxwiriXy" role="37vLTJ">
+              <node concept="Xjq3P" id="6hpwxwiriGa" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6hpwxwirjdp" role="2OqNvi">
+                <ref role="2Oxat5" node="6hpwxwirfrt" resolve="config" />
+              </node>
             </node>
           </node>
         </node>
@@ -854,14 +853,18 @@
       <node concept="10P_77" id="7WxE3hiwaMH" role="3clF45" />
       <node concept="3Tm6S6" id="7WxE3hiw8zC" role="1B3o_S" />
       <node concept="3clFbS" id="7WxE3hiw5zi" role="3clF47">
-        <node concept="3clFbF" id="7WxE3hiwl5X" role="3cqZAp">
-          <node concept="2YIFZM" id="7WxE3hiwl5Z" role="3clFbG">
-            <ref role="37wK5l" to="31yc:7iCybvT$T_P" resolve="getValue" />
-            <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-            <node concept="10M0yZ" id="7WxE3hiwl60" role="37wK5m">
+        <node concept="3clFbF" id="6hpwxwirSgm" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwirSr1" role="3clFbG">
+            <node concept="10M0yZ" id="6hpwxwirSgo" role="2Oq$k0">
               <ref role="3cqZAo" node="7iCybvT$FWp" resolve="TYPECHECKING_ENABLED" />
               <ref role="1PxDUh" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
+            <node concept="liA8E" id="6hpwxwirSD8" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+              <node concept="37vLTw" id="6hpwxwirSNz" role="37wK5m">
+                <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -872,14 +875,18 @@
       <node concept="10P_77" id="7WxE3hiwl85" role="3clF45" />
       <node concept="3Tm6S6" id="7WxE3hiwl86" role="1B3o_S" />
       <node concept="3clFbS" id="7WxE3hiwl87" role="3clF47">
-        <node concept="3clFbF" id="7WxE3hiwl88" role="3cqZAp">
-          <node concept="2YIFZM" id="7WxE3hiwl89" role="3clFbG">
-            <ref role="37wK5l" to="31yc:7iCybvT$T_P" resolve="getValue" />
-            <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-            <node concept="10M0yZ" id="7WxE3hiwt9e" role="37wK5m">
+        <node concept="3clFbF" id="6hpwxwirTEK" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwirTEL" role="3clFbG">
+            <node concept="10M0yZ" id="6hpwxwirU8h" role="2Oq$k0">
               <ref role="3cqZAo" node="7iCybvT_b52" resolve="TYPECHECKING_INCREMENTAL" />
               <ref role="1PxDUh" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
+            <node concept="liA8E" id="6hpwxwirTEN" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+              <node concept="37vLTw" id="6hpwxwirTEO" role="37wK5m">
+                <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -890,14 +897,18 @@
       <node concept="10P_77" id="7WxE3hiwtVa" role="3clF45" />
       <node concept="3Tm6S6" id="7WxE3hiwtVb" role="1B3o_S" />
       <node concept="3clFbS" id="7WxE3hiwtVc" role="3clF47">
-        <node concept="3clFbF" id="7WxE3hiwtVd" role="3cqZAp">
-          <node concept="2YIFZM" id="7WxE3hiwtVe" role="3clFbG">
-            <ref role="37wK5l" to="31yc:7iCybvT$T_P" resolve="getValue" />
-            <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-            <node concept="10M0yZ" id="7WxE3hiw_yL" role="37wK5m">
+        <node concept="3clFbF" id="6hpwxwirUB5" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwirUB6" role="3clFbG">
+            <node concept="10M0yZ" id="6hpwxwirV2i" role="2Oq$k0">
               <ref role="3cqZAo" node="7iCybvT_hbE" resolve="TYPECHECKING_TRACE" />
               <ref role="1PxDUh" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
             </node>
+            <node concept="liA8E" id="6hpwxwirUB8" role="2OqNvi">
+              <ref role="37wK5l" to="31yc:7iCybvT$ANq" resolve="get" />
+              <node concept="37vLTw" id="6hpwxwirUB9" role="37wK5m">
+                <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -1180,51 +1191,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="14IknWHovsQ" role="jymVt" />
-    <node concept="3clFb_" id="14IknWHozE8" role="jymVt">
-      <property role="TrG5h" value="getPreferenceComponent" />
-      <node concept="3clFbS" id="14IknWHozEb" role="3clF47">
-        <node concept="3cpWs8" id="4MaHsBDenkr" role="3cqZAp">
-          <node concept="3cpWsn" id="4MaHsBDenks" role="3cpWs9">
-            <property role="TrG5h" value="mpsProject" />
-            <node concept="3uibUv" id="4MaHsBDek6Y" role="1tU5fm">
-              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-            </node>
-            <node concept="1rXfSq" id="4MaHsBDeBcB" role="33vP2m">
-              <ref role="37wK5l" node="4MaHsBDes9w" resolve="discoverMPSProject" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7rg9TXc$Akz" role="3cqZAp">
-          <node concept="3K4zz7" id="7rg9TXc$Cfj" role="3clFbG">
-            <node concept="2OqwBi" id="7rg9TXc$DWY" role="3K4E3e">
-              <node concept="2OqwBi" id="7rg9TXc$CVv" role="2Oq$k0">
-                <node concept="37vLTw" id="7rg9TXc$Cmv" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4MaHsBDenks" resolve="mpsProject" />
-                </node>
-                <node concept="liA8E" id="7rg9TXc$DBW" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
-                </node>
-              </node>
-              <node concept="LR4Ub" id="7rg9TXc$En1" role="2OqNvi">
-                <ref role="LR4Ua" node="uB9WAZagv8" resolve="Typechecking" />
-              </node>
-            </node>
-            <node concept="10Nm6u" id="7rg9TXc$Eub" role="3K4GZi" />
-            <node concept="3y3z36" id="7rg9TXc$BiA" role="3K4Cdx">
-              <node concept="10Nm6u" id="7rg9TXc$BpL" role="3uHU7w" />
-              <node concept="37vLTw" id="7rg9TXc$Akx" role="3uHU7B">
-                <ref role="3cqZAo" node="4MaHsBDenks" resolve="mpsProject" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm6S6" id="14IknWHoxsG" role="1B3o_S" />
-      <node concept="34_ZPX" id="14IknWHo$ly" role="3clF45">
-        <ref role="34A7Nh" node="uB9WAZagv8" resolve="Typechecking" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="lvX$8VFq7e" role="jymVt" />
     <node concept="3clFb_" id="lvX$8VFrS8" role="jymVt">
       <property role="TrG5h" value="createQueries" />
       <node concept="3Tm1VV" id="lvX$8VFrS9" role="1B3o_S" />
@@ -1251,9 +1217,6 @@
               <node concept="1rXfSq" id="4MaHsBDeNGb" role="37wK5m">
                 <ref role="37wK5l" node="4MaHsBDes9w" resolve="discoverMPSProject" />
               </node>
-              <node concept="1rXfSq" id="5Z91lkSx9VA" role="37wK5m">
-                <ref role="37wK5l" node="7WxE3hiwl84" resolve="isIncremental" />
-              </node>
             </node>
           </node>
         </node>
@@ -1305,6 +1268,7 @@
     <node concept="2tJIrI" id="6$gg4k_6BHa" role="jymVt" />
     <node concept="312cEu" id="5BwsbZJE17w" role="jymVt">
       <property role="TrG5h" value="Queries" />
+      <property role="2bfB8j" value="true" />
       <node concept="2tJIrI" id="siuT5mm_XX" role="jymVt" />
       <node concept="3clFbW" id="4MaHsBDeJMk" role="jymVt">
         <node concept="3cqZAl" id="4MaHsBDeJMm" role="3clF45" />
@@ -1323,19 +1287,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="7rg9TXcEp5n" role="3cqZAp">
-            <node concept="37vLTI" id="7rg9TXcEpR0" role="3clFbG">
-              <node concept="37vLTw" id="7rg9TXcEqxw" role="37vLTx">
-                <ref role="3cqZAo" node="7rg9TXcEoeb" resolve="incrementalityEnabled" />
-              </node>
-              <node concept="2OqwBi" id="7rg9TXcEpi5" role="37vLTJ">
-                <node concept="Xjq3P" id="7rg9TXcEp5l" role="2Oq$k0" />
-                <node concept="2OwXpG" id="7rg9TXcEptg" role="2OqNvi">
-                  <ref role="2Oxat5" node="7wSJS_gAHJf" resolve="incrementalityEnabled" />
-                </node>
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="37vLTG" id="4MaHsBDeKVS" role="3clF46">
           <property role="TrG5h" value="mpsProject" />
@@ -1343,28 +1294,8 @@
             <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
           </node>
         </node>
-        <node concept="37vLTG" id="7rg9TXcEoeb" role="3clF46">
-          <property role="TrG5h" value="incrementalityEnabled" />
-          <node concept="10P_77" id="7rg9TXcEoDA" role="1tU5fm" />
-        </node>
       </node>
       <node concept="2tJIrI" id="4MaHsBDeIUW" role="jymVt" />
-      <node concept="3clFb_" id="MFuM6RlFvN" role="jymVt">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="4Wn$Hm2iBuM" role="3clF45">
-          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
-        </node>
-        <node concept="3Tm1VV" id="MFuM6RlFvQ" role="1B3o_S" />
-        <node concept="3clFbS" id="MFuM6RlFvR" role="3clF47">
-          <node concept="3clFbF" id="4Wn$Hm2iJTc" role="3cqZAp">
-            <node concept="2YIFZM" id="4Wn$Hm2iKnn" role="3clFbG">
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="MFuM6RlDGR" role="jymVt" />
       <node concept="3clFb_" id="siuT5mmA08" role="jymVt">
         <property role="TrG5h" value="getTypeOf" />
         <node concept="3Tm1VV" id="siuT5mmA09" role="1B3o_S" />
@@ -1382,11 +1313,11 @@
             <node concept="3cpWsn" id="2mhJggjFhiq" role="3cpWs9">
               <property role="TrG5h" value="sink" />
               <node concept="3uibUv" id="2mhJggjFhir" role="1tU5fm">
-                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
               </node>
               <node concept="2ShNRf" id="2mhJggjFhis" role="33vP2m">
                 <node concept="1pGfFk" id="2mhJggjFhit" role="2ShVmc">
-                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
                 </node>
               </node>
             </node>
@@ -1404,57 +1335,57 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="4MaHsBE6dDW" role="3cqZAp">
-            <node concept="3cpWsn" id="4MaHsBE6dDX" role="3cpWs9">
+          <node concept="3cpWs8" id="6hpwxwit4nI" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwit4nJ" role="3cpWs9">
               <property role="TrG5h" value="typeOf" />
-              <node concept="3Tqbb2" id="4MaHsBE64Yq" role="1tU5fm" />
-              <node concept="2OqwBi" id="2qsG4AwK3fF" role="33vP2m">
-                <node concept="2OqwBi" id="MFuM6RlVxv" role="2Oq$k0">
-                  <node concept="liA8E" id="MFuM6RlW_g" role="2OqNvi">
+              <node concept="3Tqbb2" id="6hpwxwit4nK" role="1tU5fm" />
+              <node concept="2OqwBi" id="6hpwxwit4nL" role="33vP2m">
+                <node concept="2OqwBi" id="6hpwxwit4nM" role="2Oq$k0">
+                  <node concept="liA8E" id="6hpwxwit4nN" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withConfig" />
-                    <node concept="1rXfSq" id="MFuM6RlXBs" role="37wK5m">
-                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="config" />
+                    <node concept="37vLTw" id="6hpwxwit4nO" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="2Y70AYEu2OT" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2mhJggjFiN5" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
-                        <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6hpwxwit4nP" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6hpwxwit4nQ" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6hpwxwit4nR" role="2Oq$k0">
+                        <node concept="2YIFZM" id="6hpwxwit4nS" role="2Oq$k0">
                           <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
                           <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
-                          <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4nT" role="37wK5m">
                             <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
+                        <node concept="liA8E" id="6hpwxwit4nU" role="2OqNvi">
                           <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                          <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4nV" role="37wK5m">
                             <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2mhJggjFjW$" role="2OqNvi">
+                      <node concept="liA8E" id="6hpwxwit4nW" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportConsumer" />
-                        <node concept="37vLTw" id="2mhJggjFkU4" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4nX" role="37wK5m">
                           <ref role="3cqZAo" node="2mhJggjFhiq" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2Y70AYEu48N" role="2OqNvi">
+                    <node concept="liA8E" id="6hpwxwit4nY" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
-                      <node concept="2YIFZM" id="2Y70AYEu64U" role="37wK5m">
+                      <node concept="2YIFZM" id="6hpwxwit4nZ" role="37wK5m">
                         <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
                         <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                        <node concept="37vLTw" id="2Y70AYEu70d" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4o0" role="37wK5m">
                           <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2qsG4AwK3fL" role="2OqNvi">
+                <node concept="liA8E" id="6hpwxwit4o1" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:3IIf9O_tkwF" resolve="getTypeOf" />
-                  <node concept="37vLTw" id="2qsG4AwK3fM" role="37wK5m">
+                  <node concept="37vLTw" id="6hpwxwit4o2" role="37wK5m">
                     <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
                   </node>
                 </node>
@@ -1509,7 +1440,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="4MaHsBE6gEa" role="3uHU7w">
-                            <ref role="3cqZAo" node="4MaHsBE6dDX" resolve="typeOf" />
+                            <ref role="3cqZAo" node="6hpwxwit4nJ" resolve="typeOf" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="2mhJggjFmi8" role="3uHU7w">
@@ -1536,7 +1467,7 @@
           <node concept="3clFbH" id="2qsG4AwK5I3" role="3cqZAp" />
           <node concept="3clFbF" id="1oUwjADnRbu" role="3cqZAp">
             <node concept="37vLTw" id="4MaHsBE6dE0" role="3clFbG">
-              <ref role="3cqZAo" node="4MaHsBE6dDX" resolve="typeOf" />
+              <ref role="3cqZAo" node="6hpwxwit4nJ" resolve="typeOf" />
             </node>
           </node>
         </node>
@@ -1566,11 +1497,11 @@
             <node concept="3cpWsn" id="2mhJggjF3Eg" role="3cpWs9">
               <property role="TrG5h" value="sink" />
               <node concept="3uibUv" id="2mhJggjF3Eh" role="1tU5fm">
-                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
               </node>
               <node concept="2ShNRf" id="2mhJggjF3Ei" role="33vP2m">
                 <node concept="1pGfFk" id="2mhJggjF3Ej" role="2ShVmc">
-                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
                 </node>
               </node>
             </node>
@@ -1588,63 +1519,63 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="2qsG4AwKAtZ" role="3cqZAp">
-            <node concept="3cpWsn" id="2qsG4AwKAu0" role="3cpWs9">
+          <node concept="3cpWs8" id="6hpwxwit4o9" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwit4oa" role="3cpWs9">
               <property role="TrG5h" value="convertsTo" />
-              <node concept="10P_77" id="2qsG4AwKFoY" role="1tU5fm" />
-              <node concept="2OqwBi" id="2qsG4AwKAu2" role="33vP2m">
-                <node concept="2OqwBi" id="MFuM6RlY9h" role="2Oq$k0">
-                  <node concept="liA8E" id="MFuM6RlY9L" role="2OqNvi">
+              <node concept="10P_77" id="6hpwxwit4ob" role="1tU5fm" />
+              <node concept="2OqwBi" id="6hpwxwit4oc" role="33vP2m">
+                <node concept="2OqwBi" id="6hpwxwit4od" role="2Oq$k0">
+                  <node concept="liA8E" id="6hpwxwit4oe" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withConfig" />
-                    <node concept="1rXfSq" id="MFuM6RlY9M" role="37wK5m">
-                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="config" />
+                    <node concept="37vLTw" id="6hpwxwit4of" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="2Y70AYEu8SZ" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2mhJggjF5ea" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
-                        <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6hpwxwit4og" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6hpwxwit4oh" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6hpwxwit4oi" role="2Oq$k0">
+                        <node concept="2YIFZM" id="6hpwxwit4oj" role="2Oq$k0">
                           <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
                           <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                          <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4ok" role="37wK5m">
                             <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
                           </node>
-                          <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4ol" role="37wK5m">
                             <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
+                        <node concept="liA8E" id="6hpwxwit4om" role="2OqNvi">
                           <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                          <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4on" role="37wK5m">
                             <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2mhJggjF6f_" role="2OqNvi">
+                      <node concept="liA8E" id="6hpwxwit4oo" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportConsumer" />
-                        <node concept="37vLTw" id="2mhJggjF7i0" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4op" role="37wK5m">
                           <ref role="3cqZAo" node="2mhJggjF3Eg" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2Y70AYEu8TF" role="2OqNvi">
+                    <node concept="liA8E" id="6hpwxwit4oq" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
-                      <node concept="2YIFZM" id="2Y70AYEu8TG" role="37wK5m">
+                      <node concept="2YIFZM" id="6hpwxwit4or" role="37wK5m">
                         <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
                         <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                        <node concept="37vLTw" id="2Y70AYEu8TH" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4os" role="37wK5m">
                           <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2qsG4AwKAu8" role="2OqNvi">
+                <node concept="liA8E" id="6hpwxwit4ot" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:3IIf9OAgpFT" resolve="getConvertsTo" />
-                  <node concept="37vLTw" id="2qsG4AwKEfL" role="37wK5m">
+                  <node concept="37vLTw" id="6hpwxwit4ou" role="37wK5m">
                     <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
                   </node>
-                  <node concept="37vLTw" id="2qsG4AwKF0$" role="37wK5m">
+                  <node concept="37vLTw" id="6hpwxwit4ov" role="37wK5m">
                     <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
                   </node>
                 </node>
@@ -1709,7 +1640,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="2qsG4AwKHpA" role="3uHU7w">
-                            <ref role="3cqZAo" node="2qsG4AwKAu0" resolve="convertsTo" />
+                            <ref role="3cqZAo" node="6hpwxwit4oa" resolve="convertsTo" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="2mhJggjF8Lf" role="3uHU7w">
@@ -1736,7 +1667,7 @@
           <node concept="3clFbH" id="2qsG4AwKHF$" role="3cqZAp" />
           <node concept="3clFbF" id="1oUwjADo1wN" role="3cqZAp">
             <node concept="37vLTw" id="2qsG4AwKGR$" role="3clFbG">
-              <ref role="3cqZAo" node="2qsG4AwKAu0" resolve="convertsTo" />
+              <ref role="3cqZAo" node="6hpwxwit4oa" resolve="convertsTo" />
             </node>
           </node>
         </node>
@@ -1768,11 +1699,11 @@
             <node concept="3cpWsn" id="2mhJggjES5t" role="3cpWs9">
               <property role="TrG5h" value="sink" />
               <node concept="3uibUv" id="2mhJggjES5u" role="1tU5fm">
-                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
               </node>
               <node concept="2ShNRf" id="2mhJggjES5v" role="33vP2m">
                 <node concept="1pGfFk" id="2mhJggjES5w" role="2ShVmc">
-                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                  <ref role="37wK5l" node="2mhJggjEueV" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
                 </node>
               </node>
             </node>
@@ -1790,63 +1721,63 @@
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="2qsG4AwKIeI" role="3cqZAp">
-            <node concept="3cpWsn" id="2qsG4AwKIeJ" role="3cpWs9">
+          <node concept="3cpWs8" id="6hpwxwit4oA" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwit4oB" role="3cpWs9">
               <property role="TrG5h" value="coerceTo" />
-              <node concept="3Tqbb2" id="2qsG4AwKKKV" role="1tU5fm" />
-              <node concept="2OqwBi" id="2qsG4AwKIeL" role="33vP2m">
-                <node concept="2OqwBi" id="MFuM6RlYRr" role="2Oq$k0">
-                  <node concept="liA8E" id="MFuM6RlZd2" role="2OqNvi">
+              <node concept="3Tqbb2" id="6hpwxwit4oC" role="1tU5fm" />
+              <node concept="2OqwBi" id="6hpwxwit4oD" role="33vP2m">
+                <node concept="2OqwBi" id="6hpwxwit4oE" role="2Oq$k0">
+                  <node concept="liA8E" id="6hpwxwit4oF" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withConfig" />
-                    <node concept="1rXfSq" id="MFuM6RlZd3" role="37wK5m">
-                      <ref role="37wK5l" node="MFuM6RlFvN" resolve="config" />
+                    <node concept="37vLTw" id="6hpwxwit4oG" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="2Y70AYEu9YO" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2mhJggjEVox" role="2Oq$k0">
-                      <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
-                        <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6hpwxwit4oH" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6hpwxwit4oI" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6hpwxwit4oJ" role="2Oq$k0">
+                        <node concept="2YIFZM" id="6hpwxwit4oK" role="2Oq$k0">
                           <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
                           <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                          <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4oL" role="37wK5m">
                             <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
                           </node>
-                          <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4oM" role="37wK5m">
                             <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
                           </node>
                         </node>
-                        <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
+                        <node concept="liA8E" id="6hpwxwit4oN" role="2OqNvi">
                           <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                          <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
+                          <node concept="37vLTw" id="6hpwxwit4oO" role="37wK5m">
                             <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
                           </node>
                         </node>
                       </node>
-                      <node concept="liA8E" id="2mhJggjEWnO" role="2OqNvi">
+                      <node concept="liA8E" id="6hpwxwit4oP" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportConsumer" />
-                        <node concept="37vLTw" id="2mhJggjEXhQ" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4oQ" role="37wK5m">
                           <ref role="3cqZAo" node="2mhJggjES5t" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="2Y70AYEuaye" role="2OqNvi">
+                    <node concept="liA8E" id="6hpwxwit4oR" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
-                      <node concept="2YIFZM" id="2Y70AYEuayf" role="37wK5m">
+                      <node concept="2YIFZM" id="6hpwxwit4oS" role="37wK5m">
                         <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
                         <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                        <node concept="37vLTw" id="2Y70AYEuayg" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4oT" role="37wK5m">
                           <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2qsG4AwKIeS" role="2OqNvi">
+                <node concept="liA8E" id="6hpwxwit4oU" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:7Bx7XgEiqaI" resolve="getCoerceTo" />
-                  <node concept="37vLTw" id="2qsG4AwKIeT" role="37wK5m">
+                  <node concept="37vLTw" id="6hpwxwit4oV" role="37wK5m">
                     <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
                   </node>
-                  <node concept="37vLTw" id="2qsG4AwKK9o" role="37wK5m">
+                  <node concept="37vLTw" id="6hpwxwit4oW" role="37wK5m">
                     <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
                   </node>
                 </node>
@@ -1911,7 +1842,7 @@
                             </node>
                           </node>
                           <node concept="37vLTw" id="2qsG4AwKLIF" role="3uHU7w">
-                            <ref role="3cqZAo" node="2qsG4AwKIeJ" resolve="coerceTo" />
+                            <ref role="3cqZAo" node="6hpwxwit4oB" resolve="coerceTo" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="2mhJggjEYo2" role="3uHU7w">
@@ -1938,7 +1869,7 @@
           <node concept="3clFbH" id="2qsG4AwKOqM" role="3cqZAp" />
           <node concept="3clFbF" id="4pwDyRARaCS" role="3cqZAp">
             <node concept="37vLTw" id="2qsG4AwKNqg" role="3clFbG">
-              <ref role="3cqZAo" node="2qsG4AwKIeJ" resolve="coerceTo" />
+              <ref role="3cqZAo" node="6hpwxwit4oB" resolve="coerceTo" />
             </node>
           </node>
         </node>
@@ -2077,11 +2008,11 @@
             <node concept="3cpWsn" id="2mhJggjEIHJ" role="3cpWs9">
               <property role="TrG5h" value="sink" />
               <node concept="3uibUv" id="2mhJggjELce" role="1tU5fm">
-                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                <ref role="3uigEE" node="2mhJggjDyUw" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
               </node>
               <node concept="2ShNRf" id="2mhJggjEIHL" role="33vP2m">
                 <node concept="1pGfFk" id="2mhJggjEIHM" role="2ShVmc">
-                  <ref role="37wK5l" node="2mhJggjDZ3H" resolve="CoderulesTypecheckingProvider.Queries.ForwardingReportItemConsumer" />
+                  <ref role="37wK5l" node="2mhJggjDZ3H" resolve="CoderulesTypecheckingProvider.ForwardingReportItemConsumer" />
                   <node concept="37vLTw" id="2mhJggjEIHN" role="37wK5m">
                     <ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
                   </node>
@@ -2132,52 +2063,52 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="2qsG4AwKYP$" role="3cqZAp">
-            <node concept="2OqwBi" id="2qsG4AwKZwC" role="3clFbG">
-              <node concept="liA8E" id="2qsG4AwL01V" role="2OqNvi">
+          <node concept="3clFbF" id="6hpwxwit4p3" role="3cqZAp">
+            <node concept="2OqwBi" id="6hpwxwit4p4" role="3clFbG">
+              <node concept="liA8E" id="6hpwxwit4p5" role="2OqNvi">
                 <ref role="37wK5l" to="tj24:1FOQehxdXIx" resolve="checkTypes" />
-                <node concept="37vLTw" id="2qsG4AwLEpJ" role="37wK5m">
+                <node concept="37vLTw" id="6hpwxwit4p6" role="37wK5m">
                   <ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
                 </node>
               </node>
-              <node concept="2OqwBi" id="2Y70AYEubqO" role="2Oq$k0">
-                <node concept="2OqwBi" id="2qsG4AwL2gk" role="2Oq$k0">
-                  <node concept="2OqwBi" id="MFuM6RlZUf" role="2Oq$k0">
-                    <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
-                      <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
+              <node concept="2OqwBi" id="6hpwxwit4p7" role="2Oq$k0">
+                <node concept="2OqwBi" id="6hpwxwit4p8" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6hpwxwit4p9" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6hpwxwit4pa" role="2Oq$k0">
+                      <node concept="2YIFZM" id="6hpwxwit4pb" role="2Oq$k0">
                         <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
                         <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                        <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4pc" role="37wK5m">
                           <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
                         </node>
                       </node>
-                      <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
+                      <node concept="liA8E" id="6hpwxwit4pd" role="2OqNvi">
                         <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
-                        <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
+                        <node concept="37vLTw" id="6hpwxwit4pe" role="37wK5m">
                           <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
                         </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="MFuM6RlZUF" role="2OqNvi">
+                    <node concept="liA8E" id="6hpwxwit4pf" role="2OqNvi">
                       <ref role="37wK5l" to="tj24:MFuM6Rlhvn" resolve="withConfig" />
-                      <node concept="1rXfSq" id="MFuM6RlZUG" role="37wK5m">
-                        <ref role="37wK5l" node="MFuM6RlFvN" resolve="config" />
+                      <node concept="37vLTw" id="6hpwxwit4pg" role="37wK5m">
+                        <ref role="3cqZAo" node="6hpwxwirfrt" resolve="config" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="2qsG4AwL2gq" role="2OqNvi">
+                  <node concept="liA8E" id="6hpwxwit4ph" role="2OqNvi">
                     <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportConsumer" />
-                    <node concept="37vLTw" id="2qsG4AwL2gr" role="37wK5m">
+                    <node concept="37vLTw" id="6hpwxwit4pi" role="37wK5m">
                       <ref role="3cqZAo" node="2mhJggjEIHJ" resolve="sink" />
                     </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="2Y70AYEubYl" role="2OqNvi">
+                <node concept="liA8E" id="6hpwxwit4pj" role="2OqNvi">
                   <ref role="37wK5l" to="tj24:2Y70AYEd10O" resolve="withMessageHandler" />
-                  <node concept="2YIFZM" id="2Y70AYEubYm" role="37wK5m">
+                  <node concept="2YIFZM" id="6hpwxwit4pk" role="37wK5m">
                     <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
                     <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                    <node concept="37vLTw" id="2Y70AYEubYn" role="37wK5m">
+                    <node concept="37vLTw" id="6hpwxwit4pl" role="37wK5m">
                       <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
                     </node>
                   </node>
@@ -2422,141 +2353,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="2mhJggjDpQU" role="jymVt" />
-      <node concept="312cEu" id="2mhJggjDyUw" role="jymVt">
-        <property role="TrG5h" value="ForwardingReportItemConsumer" />
-        <node concept="2tJIrI" id="2mhJggjE23_" role="jymVt" />
-        <node concept="3clFbW" id="2mhJggjDZ3H" role="jymVt">
-          <node concept="37vLTG" id="2mhJggjE5xb" role="3clF46">
-            <property role="TrG5h" value="consumer" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="2mhJggjE5xc" role="1tU5fm">
-              <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
-              <node concept="3qUtgH" id="2mhJggjE5xd" role="11_B2D">
-                <node concept="3uibUv" id="2mhJggjE5xe" role="3qUvdb">
-                  <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cqZAl" id="2mhJggjDZ3J" role="3clF45" />
-          <node concept="3Tm6S6" id="2mhJggjDZ3K" role="1B3o_S" />
-          <node concept="3clFbS" id="2mhJggjDZ3L" role="3clF47">
-            <node concept="3clFbF" id="2mhJggjEc3V" role="3cqZAp">
-              <node concept="37vLTI" id="2mhJggjEc3X" role="3clFbG">
-                <node concept="2OqwBi" id="2mhJggjEeC7" role="37vLTJ">
-                  <node concept="Xjq3P" id="2mhJggjEeXt" role="2Oq$k0" />
-                  <node concept="2OwXpG" id="2mhJggjEeCa" role="2OqNvi">
-                    <ref role="2Oxat5" node="2mhJggjEc3P" resolve="consumer" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2mhJggjEc41" role="37vLTx">
-                  <ref role="3cqZAo" node="2mhJggjE5xb" resolve="consumer" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="2mhJggjE3$Y" role="jymVt" />
-        <node concept="3clFbW" id="2mhJggjEueV" role="jymVt">
-          <node concept="3cqZAl" id="2mhJggjEuf0" role="3clF45" />
-          <node concept="3Tm6S6" id="2mhJggjEuf1" role="1B3o_S" />
-          <node concept="3clFbS" id="2mhJggjEuf2" role="3clF47" />
-        </node>
-        <node concept="2tJIrI" id="2mhJggjEueU" role="jymVt" />
-        <node concept="3clFb_" id="47QDz5v9qTh" role="jymVt">
-          <property role="TrG5h" value="accept" />
-          <node concept="3Tm1VV" id="47QDz5v9qTi" role="1B3o_S" />
-          <node concept="3cqZAl" id="47QDz5v9qTk" role="3clF45" />
-          <node concept="37vLTG" id="47QDz5v9qTl" role="3clF46">
-            <property role="TrG5h" value="item" />
-            <node concept="3uibUv" id="47QDz5v9xo7" role="1tU5fm">
-              <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-            </node>
-          </node>
-          <node concept="3clFbS" id="47QDz5v9qTo" role="3clF47">
-            <node concept="3clFbJ" id="2mhJggjEf63" role="3cqZAp">
-              <node concept="3clFbS" id="2mhJggjEf64" role="3clFbx">
-                <node concept="3clFbF" id="2mhJggjEt1O" role="3cqZAp">
-                  <node concept="3uNrnE" id="2mhJggjEtZY" role="3clFbG">
-                    <node concept="37vLTw" id="2mhJggjEu00" role="2$L3a6">
-                      <ref role="3cqZAo" node="2mhJggjEppw" resolve="items" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="2mhJggjEzLN" role="3cqZAp">
-                  <node concept="3clFbS" id="2mhJggjEzLP" role="3clFbx">
-                    <node concept="3clFbF" id="2mhJggjEf65" role="3cqZAp">
-                      <node concept="2OqwBi" id="2mhJggjEf66" role="3clFbG">
-                        <node concept="37vLTw" id="2mhJggjEf67" role="2Oq$k0">
-                          <ref role="3cqZAo" node="2mhJggjEc3P" resolve="consumer" />
-                        </node>
-                        <node concept="liA8E" id="2mhJggjEf68" role="2OqNvi">
-                          <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
-                          <node concept="10QFUN" id="2mhJggjEf69" role="37wK5m">
-                            <node concept="3uibUv" id="2mhJggjEf6a" role="10QFUM">
-                              <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
-                            </node>
-                            <node concept="37vLTw" id="47QDz5v9yAU" role="10QFUP">
-                              <ref role="3cqZAo" node="47QDz5v9qTl" resolve="item" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="2mhJggjE_2u" role="3clFbw">
-                    <node concept="10Nm6u" id="2mhJggjE_wr" role="3uHU7w" />
-                    <node concept="37vLTw" id="2mhJggjE$w2" role="3uHU7B">
-                      <ref role="3cqZAo" node="2mhJggjEc3P" resolve="consumer" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2ZW3vV" id="2mhJggjEf6c" role="3clFbw">
-                <node concept="3uibUv" id="2mhJggjEf6d" role="2ZW6by">
-                  <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
-                </node>
-                <node concept="37vLTw" id="47QDz5v9yez" role="2ZW6bz">
-                  <ref role="3cqZAo" node="47QDz5v9qTl" resolve="item" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="47QDz5v9qTp" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="3Tm6S6" id="2mhJggjDDP3" role="1B3o_S" />
-        <node concept="3uibUv" id="47QDz5v9msC" role="EKbjA">
-          <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
-          <node concept="3uibUv" id="47QDz5v9wbB" role="11_B2D">
-            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="2mhJggjDBuW" role="jymVt" />
-        <node concept="312cEg" id="2mhJggjEppw" role="jymVt">
-          <property role="TrG5h" value="items" />
-          <node concept="3Tm6S6" id="2mhJggjEppx" role="1B3o_S" />
-          <node concept="10Oyi0" id="2mhJggjErCT" role="1tU5fm" />
-          <node concept="3cmrfG" id="2mhJggjEs7k" role="33vP2m">
-            <property role="3cmrfH" value="0" />
-          </node>
-        </node>
-        <node concept="312cEg" id="2mhJggjEc3P" role="jymVt">
-          <property role="TrG5h" value="consumer" />
-          <node concept="3Tm6S6" id="2mhJggjEc3Q" role="1B3o_S" />
-          <node concept="3uibUv" id="2mhJggjEc3S" role="1tU5fm">
-            <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
-            <node concept="3qUtgH" id="2mhJggjEc3T" role="11_B2D">
-              <node concept="3uibUv" id="2mhJggjEc3U" role="3qUvdb">
-                <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2mhJggjDBDn" role="jymVt" />
-      <node concept="2tJIrI" id="6l3eCxofJWR" role="jymVt" />
       <node concept="312cEg" id="4MaHsBDeL9t" role="jymVt">
         <property role="TrG5h" value="mpsProject" />
         <node concept="3Tm6S6" id="4MaHsBDeL9u" role="1B3o_S" />
@@ -2564,12 +2360,139 @@
           <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
         </node>
       </node>
-      <node concept="2tJIrI" id="7wSJS_gDB0L" role="jymVt" />
-      <node concept="312cEg" id="7wSJS_gAHJf" role="jymVt">
-        <property role="TrG5h" value="incrementalityEnabled" />
-        <node concept="3Tm6S6" id="7wSJS_gAFwd" role="1B3o_S" />
-        <node concept="10P_77" id="7wSJS_gAHBG" role="1tU5fm" />
-        <node concept="3clFbT" id="7wSJS_gAJU4" role="33vP2m" />
+    </node>
+    <node concept="2tJIrI" id="6hpwxwisYIe" role="jymVt" />
+    <node concept="312cEu" id="2mhJggjDyUw" role="jymVt">
+      <property role="TrG5h" value="ForwardingReportItemConsumer" />
+      <node concept="2tJIrI" id="2mhJggjE23_" role="jymVt" />
+      <node concept="3clFbW" id="2mhJggjDZ3H" role="jymVt">
+        <node concept="37vLTG" id="2mhJggjE5xb" role="3clF46">
+          <property role="TrG5h" value="consumer" />
+          <property role="3TUv4t" value="true" />
+          <node concept="3uibUv" id="2mhJggjE5xc" role="1tU5fm">
+            <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
+            <node concept="3qUtgH" id="2mhJggjE5xd" role="11_B2D">
+              <node concept="3uibUv" id="2mhJggjE5xe" role="3qUvdb">
+                <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cqZAl" id="2mhJggjDZ3J" role="3clF45" />
+        <node concept="3Tm6S6" id="2mhJggjDZ3K" role="1B3o_S" />
+        <node concept="3clFbS" id="2mhJggjDZ3L" role="3clF47">
+          <node concept="3clFbF" id="2mhJggjEc3V" role="3cqZAp">
+            <node concept="37vLTI" id="2mhJggjEc3X" role="3clFbG">
+              <node concept="2OqwBi" id="2mhJggjEeC7" role="37vLTJ">
+                <node concept="Xjq3P" id="2mhJggjEeXt" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2mhJggjEeCa" role="2OqNvi">
+                  <ref role="2Oxat5" node="2mhJggjEc3P" resolve="consumer" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2mhJggjEc41" role="37vLTx">
+                <ref role="3cqZAo" node="2mhJggjE5xb" resolve="consumer" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2mhJggjE3$Y" role="jymVt" />
+      <node concept="3clFbW" id="2mhJggjEueV" role="jymVt">
+        <node concept="3cqZAl" id="2mhJggjEuf0" role="3clF45" />
+        <node concept="3Tm6S6" id="2mhJggjEuf1" role="1B3o_S" />
+        <node concept="3clFbS" id="2mhJggjEuf2" role="3clF47" />
+      </node>
+      <node concept="2tJIrI" id="2mhJggjEueU" role="jymVt" />
+      <node concept="3clFb_" id="47QDz5v9qTh" role="jymVt">
+        <property role="TrG5h" value="accept" />
+        <node concept="3Tm1VV" id="47QDz5v9qTi" role="1B3o_S" />
+        <node concept="3cqZAl" id="47QDz5v9qTk" role="3clF45" />
+        <node concept="37vLTG" id="47QDz5v9qTl" role="3clF46">
+          <property role="TrG5h" value="item" />
+          <node concept="3uibUv" id="47QDz5v9xo7" role="1tU5fm">
+            <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="47QDz5v9qTo" role="3clF47">
+          <node concept="3clFbJ" id="2mhJggjEf63" role="3cqZAp">
+            <node concept="3clFbS" id="2mhJggjEf64" role="3clFbx">
+              <node concept="3clFbF" id="2mhJggjEt1O" role="3cqZAp">
+                <node concept="3uNrnE" id="2mhJggjEtZY" role="3clFbG">
+                  <node concept="37vLTw" id="2mhJggjEu00" role="2$L3a6">
+                    <ref role="3cqZAo" node="2mhJggjEppw" resolve="items" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="2mhJggjEzLN" role="3cqZAp">
+                <node concept="3clFbS" id="2mhJggjEzLP" role="3clFbx">
+                  <node concept="3clFbF" id="2mhJggjEf65" role="3cqZAp">
+                    <node concept="2OqwBi" id="2mhJggjEf66" role="3clFbG">
+                      <node concept="37vLTw" id="2mhJggjEf67" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2mhJggjEc3P" resolve="consumer" />
+                      </node>
+                      <node concept="liA8E" id="2mhJggjEf68" role="2OqNvi">
+                        <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
+                        <node concept="10QFUN" id="2mhJggjEf69" role="37wK5m">
+                          <node concept="3uibUv" id="2mhJggjEf6a" role="10QFUM">
+                            <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                          </node>
+                          <node concept="37vLTw" id="47QDz5v9yAU" role="10QFUP">
+                            <ref role="3cqZAo" node="47QDz5v9qTl" resolve="item" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="2mhJggjE_2u" role="3clFbw">
+                  <node concept="10Nm6u" id="2mhJggjE_wr" role="3uHU7w" />
+                  <node concept="37vLTw" id="2mhJggjE$w2" role="3uHU7B">
+                    <ref role="3cqZAo" node="2mhJggjEc3P" resolve="consumer" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="2ZW3vV" id="2mhJggjEf6c" role="3clFbw">
+              <node concept="3uibUv" id="2mhJggjEf6d" role="2ZW6by">
+                <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+              </node>
+              <node concept="37vLTw" id="47QDz5v9yez" role="2ZW6bz">
+                <ref role="3cqZAo" node="47QDz5v9qTl" resolve="item" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="47QDz5v9qTp" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3Tm6S6" id="2mhJggjDDP3" role="1B3o_S" />
+      <node concept="3uibUv" id="47QDz5v9msC" role="EKbjA">
+        <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
+        <node concept="3uibUv" id="47QDz5v9wbB" role="11_B2D">
+          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="2mhJggjDBuW" role="jymVt" />
+      <node concept="312cEg" id="2mhJggjEppw" role="jymVt">
+        <property role="TrG5h" value="items" />
+        <node concept="3Tm6S6" id="2mhJggjEppx" role="1B3o_S" />
+        <node concept="10Oyi0" id="2mhJggjErCT" role="1tU5fm" />
+        <node concept="3cmrfG" id="2mhJggjEs7k" role="33vP2m">
+          <property role="3cmrfH" value="0" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2mhJggjEc3P" role="jymVt">
+        <property role="TrG5h" value="consumer" />
+        <node concept="3Tm6S6" id="2mhJggjEc3Q" role="1B3o_S" />
+        <node concept="3uibUv" id="2mhJggjEc3S" role="1tU5fm">
+          <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
+          <node concept="3qUtgH" id="2mhJggjEc3T" role="11_B2D">
+            <node concept="3uibUv" id="2mhJggjEc3U" role="3qUvdb">
+              <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="siuT5mmBCy" role="jymVt" />
@@ -2580,10 +2503,17 @@
         <ref role="3uigEE" node="5BwsbZJE17w" resolve="CoderulesTypecheckingProvider.Queries" />
       </node>
     </node>
+    <node concept="312cEg" id="6hpwxwirfrt" role="jymVt">
+      <property role="TrG5h" value="config" />
+      <node concept="3Tm6S6" id="6hpwxwirfru" role="1B3o_S" />
+      <node concept="3uibUv" id="6hpwxwirfrw" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+      </node>
+    </node>
   </node>
   <node concept="2uRRBC" id="vVsDu9byFZ">
     <property role="3GE5qa" value="lifecycle" />
-    <property role="TrG5h" value="TypecheckingProviderInit" />
+    <property role="TrG5h" value="TypecheckingProviderLifecycle" />
     <node concept="2BZ0e9" id="7cQXRE6zO_k" role="2uRRBG">
       <property role="TrG5h" value="providerToken" />
       <node concept="3Tm6S6" id="7cQXRE6zO_l" role="1B3o_S" />
@@ -2600,14 +2530,83 @@
       </node>
       <node concept="10Nm6u" id="3KN3A4w983U" role="33vP2m" />
     </node>
+    <node concept="2BZ0e9" id="2tFDlV2e0pd" role="2uRRBG">
+      <property role="TrG5h" value="config" />
+      <node concept="3Tm6S6" id="2tFDlV2e0pe" role="1B3o_S" />
+      <node concept="3uibUv" id="2tFDlV2e0$o" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+      </node>
+    </node>
     <node concept="2uRRBj" id="vVsDu9byG8" role="2uRRBE">
       <node concept="3clFbS" id="vVsDu9byG9" role="2VODD2">
+        <node concept="3clFbF" id="2tFDlV2e0PZ" role="3cqZAp">
+          <node concept="37vLTI" id="2tFDlV2e1i3" role="3clFbG">
+            <node concept="2YIFZM" id="2tFDlV2e1k0" role="37vLTx">
+              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            </node>
+            <node concept="2OqwBi" id="2tFDlV2e147" role="37vLTJ">
+              <node concept="2WthIp" id="2tFDlV2e0PX" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="2tFDlV2e1cB" role="2OqNvi">
+                <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="2tFDlV2cgdD" role="3cqZAp">
+          <node concept="1PaTwC" id="2tFDlV2cgdE" role="3ndbpf">
+            <node concept="3oM_SD" id="2tFDlV2cgdG" role="1PaTwD">
+              <property role="3oM_SC" value="default" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cglw" role="1PaTwD">
+              <property role="3oM_SC" value="options" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cglA" role="1PaTwD">
+              <property role="3oM_SC" value="must" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cglH" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cgmi" role="1PaTwD">
+              <property role="3oM_SC" value="registered" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cgmr" role="1PaTwD">
+              <property role="3oM_SC" value="before" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cgmT" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2tFDlV2cgn4" role="1PaTwD">
+              <property role="3oM_SC" value="provider" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7DmawKu6cN5" role="3cqZAp">
           <node concept="2YIFZM" id="7DmawKu6cRU" role="3clFbG">
             <ref role="37wK5l" node="7DmawKu60xG" resolve="registerDefaultProviders" />
             <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
+            <node concept="2OqwBi" id="2tFDlV2e1I8" role="37wK5m">
+              <node concept="2WthIp" id="2tFDlV2e1Ib" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="2tFDlV2e1Id" role="2OqNvi">
+                <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+              </node>
+            </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2tFDlV2cgnS" role="3cqZAp" />
+        <node concept="3clFbF" id="6hpwxwixv42" role="3cqZAp">
+          <node concept="2YIFZM" id="6hpwxwixxcc" role="3clFbG">
+            <ref role="37wK5l" to="tj24:6hpwxwitVpF" resolve="init" />
+            <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+            <node concept="2OqwBi" id="6hpwxwixzci" role="37wK5m">
+              <node concept="2WthIp" id="6hpwxwixzcl" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="6hpwxwixzcn" role="2OqNvi">
+                <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6hpwxwixuOO" role="3cqZAp" />
         <node concept="3cpWs8" id="3LFq2p98mmp" role="3cqZAp">
           <node concept="3cpWsn" id="3LFq2p98mmq" role="3cpWs9">
             <property role="TrG5h" value="backend" />
@@ -2638,6 +2637,12 @@
                 <node concept="2ShNRf" id="3LFq2p98pcv" role="37vLTx">
                   <node concept="1pGfFk" id="7cQXRE6zO$E" role="2ShVmc">
                     <ref role="37wK5l" node="3LFq2p98DNK" resolve="CoderulesTypecheckingProvider" />
+                    <node concept="2OqwBi" id="2tFDlV2e1OM" role="37wK5m">
+                      <node concept="2WthIp" id="2tFDlV2e1OP" role="2Oq$k0" />
+                      <node concept="2BZ7hE" id="2tFDlV2e1OR" role="2OqNvi">
+                        <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>
@@ -2742,10 +2747,33 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6hpwxwixzwz" role="3cqZAp">
+          <node concept="2YIFZM" id="6hpwxwix_zL" role="3clFbG">
+            <ref role="37wK5l" to="tj24:6hpwxwiuuCI" resolve="dispose" />
+            <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+          </node>
+        </node>
         <node concept="3clFbF" id="7DmawKu6cSL" role="3cqZAp">
           <node concept="2YIFZM" id="7DmawKu6cVh" role="3clFbG">
             <ref role="37wK5l" node="7DmawKu66Fj" resolve="clearDefaultProviders" />
             <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
+            <node concept="2OqwBi" id="2tFDlV2e1Rk" role="37wK5m">
+              <node concept="2WthIp" id="2tFDlV2e1Rn" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="2tFDlV2e1Rp" role="2OqNvi">
+                <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2tFDlV2e1Y9" role="3cqZAp">
+          <node concept="37vLTI" id="2tFDlV2e2gO" role="3clFbG">
+            <node concept="10Nm6u" id="2tFDlV2e2i4" role="37vLTx" />
+            <node concept="2OqwBi" id="2tFDlV2e25J" role="37vLTJ">
+              <node concept="2WthIp" id="2tFDlV2e1Y7" role="2Oq$k0" />
+              <node concept="2BZ7hE" id="2tFDlV2e2dM" role="2OqNvi">
+                <ref role="2WH_rO" node="2tFDlV2e0pd" resolve="config" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -4103,6 +4131,12 @@
           <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
         </node>
       </node>
+      <node concept="37vLTG" id="6hpwxwiqEEK" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiqETV" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3clFbS" id="7iCybvTy_YW" role="3clF47">
         <node concept="1HWtB8" id="7prluhlIL1p" role="3cqZAp">
           <node concept="37vLTw" id="7prluhlILaJ" role="1HWFw0">
@@ -4121,6 +4155,9 @@
                     <node concept="37vLTw" id="7prluhlJ8Wf" role="37wK5m">
                       <ref role="3cqZAo" node="7iCybvTyD30" resolve="project" />
                     </node>
+                    <node concept="37vLTw" id="6hpwxwiqG1M" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwiqEEK" resolve="config" />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -4320,14 +4357,19 @@
     <node concept="2tJIrI" id="7iCybvTy_Nr" role="jymVt" />
     <node concept="2YIFZL" id="7DmawKu60xG" role="jymVt">
       <property role="TrG5h" value="registerDefaultProviders" />
+      <node concept="37vLTG" id="2tFDlV2dY_r" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="2tFDlV2dYUi" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="7DmawKu60xI" role="3clF45" />
       <node concept="3Tmbuc" id="7DmawKu64TO" role="1B3o_S" />
       <node concept="3clFbS" id="7DmawKu60xK" role="3clF47">
         <node concept="3clFbF" id="7DmawKu61ZL" role="3cqZAp">
           <node concept="2OqwBi" id="7DmawKu61ZM" role="3clFbG">
-            <node concept="2YIFZM" id="7DmawKu61ZN" role="2Oq$k0">
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+            <node concept="37vLTw" id="2tFDlV2dZnV" role="2Oq$k0">
+              <ref role="3cqZAo" node="2tFDlV2dY_r" resolve="config" />
             </node>
             <node concept="liA8E" id="7DmawKu61ZO" role="2OqNvi">
               <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -4462,9 +4504,8 @@
       <node concept="3clFbS" id="7DmawKu66Fn" role="3clF47">
         <node concept="3clFbF" id="7DmawKu6aiU" role="3cqZAp">
           <node concept="2OqwBi" id="7DmawKu6aiV" role="3clFbG">
-            <node concept="2YIFZM" id="7DmawKu6aiW" role="2Oq$k0">
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+            <node concept="37vLTw" id="2tFDlV2e2Va" role="2Oq$k0">
+              <ref role="3cqZAo" node="2tFDlV2e2or" resolve="config" />
             </node>
             <node concept="liA8E" id="7DmawKu6aiX" role="2OqNvi">
               <ref role="37wK5l" to="31yc:7prluhlHqSp" resolve="clearProvider" />
@@ -4479,6 +4520,12 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="2tFDlV2e2or" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="2tFDlV2e2oq" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7DmawKu65cf" role="jymVt" />
     <node concept="3clFbW" id="7iCybvTyDLm" role="jymVt">
@@ -4498,6 +4545,19 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="6hpwxwiq_4O" role="3cqZAp">
+          <node concept="37vLTI" id="6hpwxwiq_s7" role="3clFbG">
+            <node concept="37vLTw" id="6hpwxwiq_D1" role="37vLTx">
+              <ref role="3cqZAo" node="6hpwxwiq5P7" resolve="config" />
+            </node>
+            <node concept="2OqwBi" id="6hpwxwiq_cJ" role="37vLTJ">
+              <node concept="Xjq3P" id="6hpwxwiq_4M" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6hpwxwiq_km" role="2OqNvi">
+                <ref role="2Oxat5" node="2tFDlV2e4Ua" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="7iCybvTyDXA" role="3clF46">
         <property role="TrG5h" value="project" />
@@ -4505,6 +4565,12 @@
           <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
         </node>
       </node>
+      <node concept="37vLTG" id="6hpwxwiq5P7" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiq$Ep" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7prluhlIXbE" role="jymVt" />
     <node concept="3clFb_" id="7prluhlILnV" role="jymVt">
@@ -4515,6 +4581,9 @@
         <node concept="3clFbF" id="7prluhlILnR" role="3cqZAp">
           <node concept="1rXfSq" id="7prluhlILnS" role="3clFbG">
             <ref role="37wK5l" node="7iCybvTyEuz" resolve="registerProjectProviders" />
+            <node concept="37vLTw" id="6hpwxwiq_JT" role="37wK5m">
+              <ref role="3cqZAo" node="2tFDlV2e4Ua" resolve="config" />
+            </node>
           </node>
         </node>
       </node>
@@ -4528,6 +4597,9 @@
         <node concept="3clFbF" id="7prluhlIZ07" role="3cqZAp">
           <node concept="1rXfSq" id="7prluhlJ2ZO" role="3clFbG">
             <ref role="37wK5l" node="7prluhlIEv5" resolve="clearProjectProviders" />
+            <node concept="37vLTw" id="6hpwxwiq_RD" role="37wK5m">
+              <ref role="3cqZAo" node="2tFDlV2e4Ua" resolve="config" />
+            </node>
           </node>
         </node>
         <node concept="3clFbF" id="7prluhlJkj8" role="3cqZAp">
@@ -4546,6 +4618,12 @@
     <node concept="2tJIrI" id="7prluhlJn3m" role="jymVt" />
     <node concept="3clFb_" id="7iCybvTyEuz" role="jymVt">
       <property role="TrG5h" value="registerProjectProviders" />
+      <node concept="37vLTG" id="6hpwxwiq_U$" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiqBaG" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="7iCybvTyEu_" role="3clF45" />
       <node concept="3Tm6S6" id="7iCybvTyEx7" role="1B3o_S" />
       <node concept="3clFbS" id="7iCybvTyEuB" role="3clF47">
@@ -4606,9 +4684,8 @@
         </node>
         <node concept="3clFbF" id="7iCybvTyAh$" role="3cqZAp">
           <node concept="2OqwBi" id="7iCybvTyAvh" role="3clFbG">
-            <node concept="2YIFZM" id="7iCybvTyAqJ" role="2Oq$k0">
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            <node concept="37vLTw" id="6hpwxwiqBEz" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiq_U$" resolve="config" />
             </node>
             <node concept="liA8E" id="7iCybvTyAAH" role="2OqNvi">
               <ref role="37wK5l" to="31yc:7iCybvTszk9" resolve="registerProvider" />
@@ -4753,9 +4830,8 @@
       <node concept="3clFbS" id="7prluhlIEv9" role="3clF47">
         <node concept="3clFbF" id="7prluhlIINl" role="3cqZAp">
           <node concept="2OqwBi" id="7prluhlIJ8d" role="3clFbG">
-            <node concept="2YIFZM" id="7prluhlIIVL" role="2Oq$k0">
-              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
-              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            <node concept="37vLTw" id="6hpwxwiqDCG" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwiqC4I" resolve="config" />
             </node>
             <node concept="liA8E" id="7prluhlIJou" role="2OqNvi">
               <ref role="37wK5l" to="31yc:7prluhlHqSp" resolve="clearProvider" />
@@ -4770,17 +4846,29 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="6hpwxwiqC4I" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiqC4H" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="7iCybvTyXGW" role="jymVt" />
     <node concept="3Tm1VV" id="7iCybvTy_Mc" role="1B3o_S" />
     <node concept="312cEg" id="7iCybvTyDYC" role="jymVt">
       <property role="TrG5h" value="project" />
-      <property role="34CwA1" value="true" />
       <node concept="3Tmbuc" id="7iCybvTz2IL" role="1B3o_S" />
       <node concept="3uibUv" id="7iCybvTyDYF" role="1tU5fm">
         <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
       </node>
     </node>
+    <node concept="312cEg" id="2tFDlV2e4Ua" role="jymVt">
+      <property role="TrG5h" value="config" />
+      <node concept="3Tm6S6" id="2tFDlV2e4Ub" role="1B3o_S" />
+      <node concept="3uibUv" id="2tFDlV2e5Kp" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="7iCybvTyHA6" role="jymVt" />
   </node>
   <node concept="2uRRBy" id="7iCybvTzg9q">
@@ -4798,6 +4886,10 @@
                 <ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
               </node>
             </node>
+            <node concept="2YIFZM" id="6hpwxwiqEaO" role="37wK5m">
+              <ref role="37wK5l" to="31yc:7iCybvTs3lI" resolve="getInstance" />
+              <ref role="1Pybhc" to="31yc:7iCybvToiT5" resolve="Config" />
+            </node>
           </node>
         </node>
       </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index deecc1a5..9a1b42be 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -91,6 +91,9 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <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="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
+        <child id="1076505808688" name="condition" index="2$JKZa" />
+      </concept>
       <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
       </concept>
@@ -4787,6 +4790,592 @@
   <node concept="312cEu" id="7kaxm0sEy3e">
     <property role="TrG5h" value="TypecheckingService" />
     <node concept="2tJIrI" id="7kaxm0sEy44" role="jymVt" />
+    <node concept="312cEu" id="6hpwxwitoJO" role="jymVt">
+      <property role="TrG5h" value="Factory" />
+      <node concept="2tJIrI" id="6hpwxwitBpL" role="jymVt" />
+      <node concept="3clFbW" id="6hpwxwit$7F" role="jymVt">
+        <node concept="37vLTG" id="6hpwxwit_Na" role="3clF46">
+          <property role="TrG5h" value="config" />
+          <node concept="3uibUv" id="6hpwxwit_Sb" role="1tU5fm">
+            <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="6hpwxwit$7H" role="3clF45" />
+        <node concept="3Tm1VV" id="6hpwxwit$7I" role="1B3o_S" />
+        <node concept="3clFbS" id="6hpwxwit$7J" role="3clF47">
+          <node concept="3clFbF" id="6hpwxwiuIzO" role="3cqZAp">
+            <node concept="37vLTI" id="6hpwxwiuIzQ" role="3clFbG">
+              <node concept="2OqwBi" id="6hpwxwiuKvK" role="37vLTJ">
+                <node concept="Xjq3P" id="6hpwxwiuKD$" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6hpwxwiuKvN" role="2OqNvi">
+                  <ref role="2Oxat5" node="6hpwxwiuIzK" resolve="config" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6hpwxwiuIzU" role="37vLTx">
+                <ref role="3cqZAo" node="6hpwxwit_Na" resolve="config" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6hpwxwiwBhn" role="jymVt" />
+      <node concept="3clFb_" id="6hpwxwivrzL" role="jymVt">
+        <property role="TrG5h" value="forNode" />
+        <node concept="3clFbS" id="6hpwxwivjhA" role="3clF47">
+          <node concept="3clFbF" id="6hpwxwivjhB" role="3cqZAp">
+            <node concept="2OqwBi" id="6hpwxwivjhC" role="3clFbG">
+              <node concept="2ShNRf" id="6hpwxwivjhD" role="2Oq$k0">
+                <node concept="1pGfFk" id="6hpwxwivjhE" role="2ShVmc">
+                  <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
+                  <node concept="1rXfSq" id="6hpwxwiwiKR" role="37wK5m">
+                    <ref role="37wK5l" node="3IIf9O_tL1f" resolve="repository" />
+                    <node concept="37vLTw" id="6hpwxwivjhG" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwivjhz" resolve="node" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="6hpwxwivjhH" role="2OqNvi">
+                <ref role="37wK5l" node="MFuM6Rlhvn" resolve="withConfig" />
+                <node concept="37vLTw" id="6hpwxwixqEP" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwiuIzK" resolve="config" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjhz" role="3clF46">
+          <property role="TrG5h" value="node" />
+          <node concept="3Tqbb2" id="6hpwxwivjh$" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="6hpwxwivjh_" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm1VV" id="6hpwxwivjhK" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwivjiM" role="jymVt" />
+      <node concept="3clFb_" id="6hpwxwivu0_" role="jymVt">
+        <property role="TrG5h" value="for2Node" />
+        <node concept="3clFbS" id="6hpwxwivjiU" role="3clF47">
+          <node concept="3cpWs8" id="6hpwxwivjiV" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwivjiW" role="3cpWs9">
+              <property role="TrG5h" value="tf1" />
+              <node concept="3uibUv" id="6hpwxwivjiX" role="1tU5fm">
+                <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              </node>
+              <node concept="2YIFZM" id="6hpwxwivjiY" role="33vP2m">
+                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+                <node concept="37vLTw" id="6hpwxwivjiZ" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwivjiO" resolve="node1" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6hpwxwivjj0" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwivjj1" role="3cpWs9">
+              <property role="TrG5h" value="tf2" />
+              <node concept="3uibUv" id="6hpwxwivjj2" role="1tU5fm">
+                <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              </node>
+              <node concept="2YIFZM" id="6hpwxwivjj3" role="33vP2m">
+                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+                <node concept="37vLTw" id="6hpwxwivjj4" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwivjiQ" resolve="node2" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6hpwxwivjj5" role="3cqZAp" />
+          <node concept="3clFbJ" id="6hpwxwivjj6" role="3cqZAp">
+            <node concept="3clFbS" id="6hpwxwivjj7" role="3clFbx">
+              <node concept="YS8fn" id="6hpwxwivjj8" role="3cqZAp">
+                <node concept="2ShNRf" id="6hpwxwivjj9" role="YScLw">
+                  <node concept="1pGfFk" id="6hpwxwivjja" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                    <node concept="Xl_RD" id="6hpwxwivjjb" role="37wK5m">
+                      <property role="Xl_RC" value="repositories differ" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="6hpwxwivjjc" role="3clFbw">
+              <node concept="2OqwBi" id="6hpwxwivjjd" role="3uHU7w">
+                <node concept="37vLTw" id="6hpwxwivjje" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6hpwxwivjj1" resolve="tf2" />
+                </node>
+                <node concept="2OwXpG" id="6hpwxwivjjf" role="2OqNvi">
+                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6hpwxwivjjg" role="3uHU7B">
+                <node concept="37vLTw" id="6hpwxwivjjh" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6hpwxwivjiW" resolve="tf1" />
+                </node>
+                <node concept="2OwXpG" id="6hpwxwivjji" role="2OqNvi">
+                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6hpwxwivjjj" role="3cqZAp" />
+          <node concept="3clFbF" id="6hpwxwivjjk" role="3cqZAp">
+            <node concept="37vLTw" id="6hpwxwivjjl" role="3clFbG">
+              <ref role="3cqZAo" node="6hpwxwivjiW" resolve="tf1" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjiO" role="3clF46">
+          <property role="TrG5h" value="node1" />
+          <node concept="3Tqbb2" id="6hpwxwivjiP" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjiQ" role="3clF46">
+          <property role="TrG5h" value="node2" />
+          <node concept="3Tqbb2" id="6hpwxwivjiR" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="6hpwxwivjiS" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm1VV" id="6hpwxwivjiT" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwivjjm" role="jymVt" />
+      <node concept="3clFb_" id="6hpwxwivwOV" role="jymVt">
+        <property role="TrG5h" value="forNodeAndConcept" />
+        <node concept="3clFbS" id="6hpwxwivjju" role="3clF47">
+          <node concept="3cpWs8" id="6hpwxwivjjv" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwivjjw" role="3cpWs9">
+              <property role="TrG5h" value="tf1" />
+              <node concept="3uibUv" id="6hpwxwivjjx" role="1tU5fm">
+                <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              </node>
+              <node concept="2YIFZM" id="6hpwxwivjjy" role="33vP2m">
+                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+                <node concept="37vLTw" id="6hpwxwivjjz" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwivjjo" resolve="node" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="6hpwxwivjj$" role="3cqZAp">
+            <node concept="3cpWsn" id="6hpwxwivjj_" role="3cpWs9">
+              <property role="TrG5h" value="tf2" />
+              <node concept="3uibUv" id="6hpwxwivjjA" role="1tU5fm">
+                <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              </node>
+              <node concept="2YIFZM" id="6hpwxwivjjB" role="33vP2m">
+                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+                <ref role="37wK5l" node="7Bx7XgEii_q" resolve="forConcept" />
+                <node concept="37vLTw" id="6hpwxwivjjC" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwivjjq" resolve="concept" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6hpwxwivjjD" role="3cqZAp" />
+          <node concept="3clFbJ" id="6hpwxwivjjE" role="3cqZAp">
+            <node concept="3clFbS" id="6hpwxwivjjF" role="3clFbx">
+              <node concept="YS8fn" id="6hpwxwivjjG" role="3cqZAp">
+                <node concept="2ShNRf" id="6hpwxwivjjH" role="YScLw">
+                  <node concept="1pGfFk" id="6hpwxwivjjI" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                    <node concept="Xl_RD" id="6hpwxwivjjJ" role="37wK5m">
+                      <property role="Xl_RC" value="repositories differ" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3y3z36" id="6hpwxwivjjK" role="3clFbw">
+              <node concept="2OqwBi" id="6hpwxwivjjL" role="3uHU7w">
+                <node concept="37vLTw" id="6hpwxwivjjM" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6hpwxwivjj_" resolve="tf2" />
+                </node>
+                <node concept="2OwXpG" id="6hpwxwivjjN" role="2OqNvi">
+                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6hpwxwivjjO" role="3uHU7B">
+                <node concept="37vLTw" id="6hpwxwivjjP" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6hpwxwivjjw" resolve="tf1" />
+                </node>
+                <node concept="2OwXpG" id="6hpwxwivjjQ" role="2OqNvi">
+                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6hpwxwivjjR" role="3cqZAp" />
+          <node concept="3clFbF" id="6hpwxwivjjS" role="3cqZAp">
+            <node concept="37vLTw" id="6hpwxwivjjT" role="3clFbG">
+              <ref role="3cqZAo" node="6hpwxwivjjw" resolve="tf1" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjjo" role="3clF46">
+          <property role="TrG5h" value="node" />
+          <node concept="3Tqbb2" id="6hpwxwivjjp" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjjq" role="3clF46">
+          <property role="TrG5h" value="concept" />
+          <node concept="3bZ5Sz" id="6hpwxwivjjr" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="6hpwxwivjjs" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm1VV" id="6hpwxwivjjt" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwivjjU" role="jymVt" />
+      <node concept="3clFb_" id="6hpwxwivzi_" role="jymVt">
+        <property role="TrG5h" value="forConcept" />
+        <node concept="3clFbS" id="6hpwxwivjjZ" role="3clF47">
+          <node concept="3clFbF" id="6hpwxwivjk0" role="3cqZAp">
+            <node concept="2OqwBi" id="6hpwxwivjk1" role="3clFbG">
+              <node concept="2ShNRf" id="6hpwxwivjk2" role="2Oq$k0">
+                <node concept="1pGfFk" id="6hpwxwivjk3" role="2ShVmc">
+                  <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
+                  <node concept="1rXfSq" id="6hpwxwiwpnz" role="37wK5m">
+                    <ref role="37wK5l" node="7Bx7XgEi3J2" resolve="repository" />
+                    <node concept="37vLTw" id="6hpwxwivjk5" role="37wK5m">
+                      <ref role="3cqZAo" node="6hpwxwivjjW" resolve="concept" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="6hpwxwivjk6" role="2OqNvi">
+                <ref role="37wK5l" node="MFuM6Rlhvn" resolve="withConfig" />
+                <node concept="37vLTw" id="6hpwxwixras" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwiuIzK" resolve="config" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjjW" role="3clF46">
+          <property role="TrG5h" value="concept" />
+          <node concept="3bZ5Sz" id="6hpwxwivjjX" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="6hpwxwivjjY" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm1VV" id="6hpwxwivjk9" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwivjli" role="jymVt" />
+      <node concept="3clFb_" id="6hpwxwiv_Ya" role="jymVt">
+        <property role="TrG5h" value="forRepository" />
+        <node concept="3clFbS" id="6hpwxwivjln" role="3clF47">
+          <node concept="3clFbF" id="6hpwxwivjlo" role="3cqZAp">
+            <node concept="2OqwBi" id="6hpwxwivjlp" role="3clFbG">
+              <node concept="2ShNRf" id="6hpwxwivjlq" role="2Oq$k0">
+                <node concept="1pGfFk" id="6hpwxwivjlr" role="2ShVmc">
+                  <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
+                  <node concept="37vLTw" id="6hpwxwivjls" role="37wK5m">
+                    <ref role="3cqZAo" node="6hpwxwivjlk" resolve="repository" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="6hpwxwivjlt" role="2OqNvi">
+                <ref role="37wK5l" node="MFuM6Rlhvn" resolve="withConfig" />
+                <node concept="37vLTw" id="6hpwxwixtdt" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwiuIzK" resolve="config" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="6hpwxwivjlk" role="3clF46">
+          <property role="TrG5h" value="repository" />
+          <node concept="3uibUv" id="6hpwxwivjll" role="1tU5fm">
+            <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+          </node>
+        </node>
+        <node concept="3uibUv" id="6hpwxwivjlm" role="3clF45">
+          <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        </node>
+        <node concept="3Tm1VV" id="6hpwxwivjlw" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwiviPO" role="jymVt" />
+      <node concept="3Tm6S6" id="6hpwxwiuR3o" role="1B3o_S" />
+      <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="1PaTwC" id="589APehYyjh" role="3ndbpf">
+                  <node concept="3oM_SD" id="589APehYyji" role="1PaTwD">
+                    <property role="3oM_SC" value="FIXME" />
+                  </node>
+                  <node concept="3oM_SD" id="589APehYyjj" role="1PaTwD">
+                    <property role="3oM_SC" value="the" />
+                  </node>
+                  <node concept="3oM_SD" id="589APehYyjk" role="1PaTwD">
+                    <property role="3oM_SC" value="default" />
+                  </node>
+                  <node concept="3oM_SD" id="589APehYyjl" role="1PaTwD">
+                    <property role="3oM_SC" value="repository" />
+                  </node>
+                </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()" 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()" 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="2YIFZL" id="7Bx7XgEi3J2" role="jymVt">
+        <property role="TrG5h" value="repository" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3clFbS" id="7Bx7XgEi3J3" role="3clF47">
+          <node concept="3clFbF" id="7Bx7XgEi7TK" role="3cqZAp">
+            <node concept="2OqwBi" id="7Bx7XgEi9$a" role="3clFbG">
+              <node concept="2OqwBi" id="7Bx7XgEi8VN" role="2Oq$k0">
+                <node concept="2OqwBi" id="7Bx7XgEi89$" role="2Oq$k0">
+                  <node concept="37vLTw" id="7Bx7XgEi7TI" role="2Oq$k0">
+                    <ref role="3cqZAo" node="7Bx7XgEi3Jt" resolve="concept" />
+                  </node>
+                  <node concept="liA8E" id="7Bx7XgEi8Pr" role="2OqNvi">
+                    <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="7Bx7XgEi9ts" role="2OqNvi">
+                  <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
+                </node>
+              </node>
+              <node concept="liA8E" id="7Bx7XgEia9v" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SModule.getRepository()" resolve="getRepository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="7Bx7XgEi3Jt" role="3clF46">
+          <property role="TrG5h" value="concept" />
+          <node concept="3bZ5Sz" id="7Bx7XgEi6oT" role="1tU5fm" />
+        </node>
+        <node concept="3uibUv" id="7Bx7XgEi3Jv" role="3clF45">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+        <node concept="3Tm6S6" id="7Bx7XgEi3Jw" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6hpwxwit$1b" role="jymVt" />
+      <node concept="312cEg" id="6hpwxwiuIzK" role="jymVt">
+        <property role="TrG5h" value="config" />
+        <node concept="3Tm6S6" id="6hpwxwiuIzL" role="1B3o_S" />
+        <node concept="3uibUv" id="6hpwxwiuIzN" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwiti8G" role="jymVt" />
+    <node concept="Wx3nA" id="6hpwxwitD9W" role="jymVt">
+      <property role="TrG5h" value="FACTORY" />
+      <node concept="3Tm6S6" id="6hpwxwitD9Y" role="1B3o_S" />
+      <node concept="3uibUv" id="6hpwxwitLdo" role="1tU5fm">
+        <ref role="3uigEE" node="6hpwxwitoJO" resolve="TypecheckingService.Factory" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwitOjb" role="jymVt" />
+    <node concept="Wx3nA" id="6hpwxwixV5a" role="jymVt">
+      <property role="TrG5h" value="INIT_BARRIER" />
+      <node concept="3Tm6S6" id="6hpwxwixV5c" role="1B3o_S" />
+      <node concept="3uibUv" id="6hpwxwiy0Y$" role="1tU5fm">
+        <ref role="3uigEE" to="5zyv:~CountDownLatch" resolve="CountDownLatch" />
+      </node>
+      <node concept="2ShNRf" id="6hpwxwiy5OI" role="33vP2m">
+        <node concept="1pGfFk" id="6hpwxwiy5Ip" role="2ShVmc">
+          <ref role="37wK5l" to="5zyv:~CountDownLatch.&lt;init&gt;(int)" resolve="CountDownLatch" />
+          <node concept="3cmrfG" id="6hpwxwiy7jv" role="37wK5m">
+            <property role="3cmrfH" value="1" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwixBLI" role="jymVt" />
+    <node concept="2YIFZL" id="6hpwxwitVpF" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="37vLTG" id="6hpwxwiu2Ky" role="3clF46">
+        <property role="TrG5h" value="config" />
+        <node concept="3uibUv" id="6hpwxwiu3iz" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:7iCybvToiT5" resolve="Config" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6hpwxwitVpH" role="3clF45" />
+      <node concept="3Tm1VV" id="6hpwxwitVpI" role="1B3o_S" />
+      <node concept="3clFbS" id="6hpwxwitVpJ" role="3clF47">
+        <node concept="3clFbF" id="6hpwxwiu6W5" role="3cqZAp">
+          <node concept="37vLTI" id="6hpwxwiu8Qe" role="3clFbG">
+            <node concept="2ShNRf" id="6hpwxwiuaLx" role="37vLTx">
+              <node concept="1pGfFk" id="6hpwxwiu8WX" role="2ShVmc">
+                <ref role="37wK5l" node="6hpwxwit$7F" resolve="TypecheckingService.Factory" />
+                <node concept="37vLTw" id="6hpwxwiuaT$" role="37wK5m">
+                  <ref role="3cqZAo" node="6hpwxwiu2Ky" resolve="config" />
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6hpwxwiu6W4" role="37vLTJ">
+              <ref role="3cqZAo" node="6hpwxwitD9W" resolve="FACTORY" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6hpwxwiy95l" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwiyaOt" role="3clFbG">
+            <node concept="37vLTw" id="6hpwxwiy95j" role="2Oq$k0">
+              <ref role="3cqZAo" node="6hpwxwixV5a" resolve="INIT_BARRIER" />
+            </node>
+            <node concept="liA8E" id="6hpwxwiycDK" role="2OqNvi">
+              <ref role="37wK5l" to="5zyv:~CountDownLatch.countDown()" resolve="countDown" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwiuckQ" role="jymVt" />
+    <node concept="2YIFZL" id="6hpwxwiuuCI" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="3cqZAl" id="6hpwxwiuuCK" role="3clF45" />
+      <node concept="3Tm1VV" id="6hpwxwiuuCL" role="1B3o_S" />
+      <node concept="3clFbS" id="6hpwxwiuuCM" role="3clF47">
+        <node concept="3clFbF" id="6hpwxwiuF35" role="3cqZAp">
+          <node concept="37vLTI" id="6hpwxwiuGYi" role="3clFbG">
+            <node concept="10Nm6u" id="6hpwxwiuH50" role="37vLTx" />
+            <node concept="37vLTw" id="6hpwxwiuF34" role="37vLTJ">
+              <ref role="3cqZAo" node="6hpwxwitD9W" resolve="FACTORY" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwiwGx4" role="jymVt" />
+    <node concept="2YIFZL" id="6hpwxwiwZuc" role="jymVt">
+      <property role="TrG5h" value="factory" />
+      <node concept="3uibUv" id="6hpwxwix4DZ" role="3clF45">
+        <ref role="3uigEE" node="6hpwxwitoJO" resolve="TypecheckingService.Factory" />
+      </node>
+      <node concept="3Tm6S6" id="6hpwxwiwZue" role="1B3o_S" />
+      <node concept="3clFbS" id="6hpwxwiwZug" role="3clF47">
+        <node concept="3cpWs8" id="6hpwxwiyh1e" role="3cqZAp">
+          <node concept="3cpWsn" id="6hpwxwiyh1h" role="3cpWs9">
+            <property role="TrG5h" value="retrying" />
+            <node concept="10P_77" id="6hpwxwiyh1c" role="1tU5fm" />
+            <node concept="3clFbT" id="6hpwxwiyhd3" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="2$JKZl" id="6hpwxwiylv5" role="3cqZAp">
+          <node concept="3clFbS" id="6hpwxwiylv7" role="2LFqv$">
+            <node concept="SfApY" id="6hpwxwiyeYA" role="3cqZAp">
+              <node concept="3clFbS" id="6hpwxwiyeYB" role="SfCbr">
+                <node concept="3clFbF" id="6hpwxwiycUu" role="3cqZAp">
+                  <node concept="2OqwBi" id="6hpwxwiyd6r" role="3clFbG">
+                    <node concept="37vLTw" id="6hpwxwiycUs" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6hpwxwixV5a" resolve="INIT_BARRIER" />
+                    </node>
+                    <node concept="liA8E" id="6hpwxwiyeVt" role="2OqNvi">
+                      <ref role="37wK5l" to="5zyv:~CountDownLatch.await()" resolve="await" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3zACq4" id="6hpwxwiynID" role="3cqZAp" />
+                <node concept="3clFbH" id="6hpwxwiynKf" role="3cqZAp" />
+              </node>
+              <node concept="TDmWw" id="6hpwxwiyeYy" role="TEbGg">
+                <node concept="3clFbS" id="6hpwxwiyeYz" role="TDEfX">
+                  <node concept="3clFbJ" id="6hpwxwiyhnm" role="3cqZAp">
+                    <node concept="37vLTw" id="6hpwxwiyh$s" role="3clFbw">
+                      <ref role="3cqZAo" node="6hpwxwiyh1h" resolve="retrying" />
+                    </node>
+                    <node concept="3clFbS" id="6hpwxwiyhno" role="3clFbx">
+                      <node concept="YS8fn" id="6hpwxwiyhII" role="3cqZAp">
+                        <node concept="2ShNRf" id="6hpwxwiyhPw" role="YScLw">
+                          <node concept="1pGfFk" id="6hpwxwiykhG" role="2ShVmc">
+                            <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
+                            <node concept="37vLTw" id="6hpwxwiykpN" role="37wK5m">
+                              <ref role="3cqZAo" node="6hpwxwiyeY$" resolve="e" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbF" id="6hpwxwiykF$" role="3cqZAp">
+                    <node concept="37vLTI" id="6hpwxwiyl81" role="3clFbG">
+                      <node concept="3clFbT" id="6hpwxwiyleB" role="37vLTx">
+                        <property role="3clFbU" value="true" />
+                      </node>
+                      <node concept="37vLTw" id="6hpwxwiykFy" role="37vLTJ">
+                        <ref role="3cqZAo" node="6hpwxwiyh1h" resolve="retrying" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWsn" id="6hpwxwiyeY$" role="TDEfY">
+                  <property role="TrG5h" value="e" />
+                  <node concept="3uibUv" id="6hpwxwiyeY_" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~InterruptedException" resolve="InterruptedException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbT" id="6hpwxwiylEn" role="2$JKZa">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="6hpwxwixdbu" role="3cqZAp">
+          <node concept="37vLTw" id="6hpwxwixdbt" role="3clFbG">
+            <ref role="3cqZAo" node="6hpwxwitD9W" resolve="FACTORY" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6hpwxwitiv4" role="jymVt" />
     <node concept="2YIFZL" id="3IIf9O_u0Ck" role="jymVt">
       <property role="TrG5h" value="typeOf" />
       <property role="DiZV1" value="false" />
@@ -4927,16 +5516,15 @@
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
       <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="TypecheckingService" />
-              <node concept="2YIFZM" id="3IIf9O_Z9Ao" role="37wK5m">
-                <ref role="37wK5l" node="3IIf9O_tL1f" resolve="repository" />
-                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                <node concept="37vLTw" id="3IIf9O_Z9Ap" role="37wK5m">
-                  <ref role="3cqZAo" node="3IIf9O_Z79b" resolve="node" />
-                </node>
+        <node concept="3clFbF" id="6hpwxwiwbd7" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwiwcJu" role="3clFbG">
+            <node concept="1rXfSq" id="6hpwxwixfaI" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
+            </node>
+            <node concept="liA8E" id="6hpwxwiwe$Z" role="2OqNvi">
+              <ref role="37wK5l" node="6hpwxwivrzL" resolve="forNode" />
+              <node concept="37vLTw" id="6hpwxwiweSK" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9O_Z79b" resolve="node" />
               </node>
             </node>
           </node>
@@ -4960,75 +5548,22 @@
       </node>
       <node concept="3Tm1VV" id="2qsG4AwIYLr" role="1B3o_S" />
       <node concept="3clFbS" id="2qsG4AwIYLs" role="3clF47">
-        <node concept="3cpWs8" id="2qsG4AwJiyp" role="3cqZAp">
-          <node concept="3cpWsn" id="2qsG4AwJiyq" role="3cpWs9">
-            <property role="TrG5h" value="tf1" />
-            <node concept="3uibUv" id="2qsG4AwJiyr" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        <node concept="3clFbF" id="6hpwxwiw2vW" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwiw2DV" role="3clFbG">
+            <node concept="1rXfSq" id="6hpwxwixgYc" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
             </node>
-            <node concept="2YIFZM" id="2qsG4AwJiys" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2qsG4AwJkvW" role="37wK5m">
+            <node concept="liA8E" id="6hpwxwiw4KI" role="2OqNvi">
+              <ref role="37wK5l" node="6hpwxwivu0_" resolve="for2Node" />
+              <node concept="37vLTw" id="6hpwxwiw547" role="37wK5m">
                 <ref role="3cqZAo" node="2qsG4AwIYLo" resolve="node1" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2qsG4AwJiyu" role="3cqZAp">
-          <node concept="3cpWsn" id="2qsG4AwJiyv" role="3cpWs9">
-            <property role="TrG5h" value="tf2" />
-            <node concept="3uibUv" id="2qsG4AwJiyw" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="2qsG4AwJiyx" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2qsG4AwJlAx" role="37wK5m">
+              <node concept="37vLTw" id="6hpwxwiw7cn" role="37wK5m">
                 <ref role="3cqZAo" node="2qsG4AwJcNJ" resolve="node2" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2qsG4AwJiyz" role="3cqZAp" />
-        <node concept="3clFbJ" id="2qsG4AwJiy$" role="3cqZAp">
-          <node concept="3clFbS" id="2qsG4AwJiy_" role="3clFbx">
-            <node concept="YS8fn" id="2qsG4AwJiyA" role="3cqZAp">
-              <node concept="2ShNRf" id="2qsG4AwJiyB" role="YScLw">
-                <node concept="1pGfFk" id="2qsG4AwJiyC" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                  <node concept="Xl_RD" id="2qsG4AwJiyD" role="37wK5m">
-                    <property role="Xl_RC" value="repositories differ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="2qsG4AwJiyE" role="3clFbw">
-            <node concept="2OqwBi" id="2qsG4AwJiyF" role="3uHU7w">
-              <node concept="37vLTw" id="2qsG4AwJiyG" role="2Oq$k0">
-                <ref role="3cqZAo" node="2qsG4AwJiyv" resolve="tf2" />
-              </node>
-              <node concept="2OwXpG" id="2qsG4AwJiyH" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="2qsG4AwJiyI" role="3uHU7B">
-              <node concept="37vLTw" id="2qsG4AwJiyJ" role="2Oq$k0">
-                <ref role="3cqZAo" node="2qsG4AwJiyq" resolve="tf1" />
-              </node>
-              <node concept="2OwXpG" id="2qsG4AwJiyK" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2qsG4AwJivY" role="3cqZAp" />
-        <node concept="3clFbF" id="2qsG4AwJmZH" role="3cqZAp">
-          <node concept="37vLTw" id="2qsG4AwJmZF" role="3clFbG">
-            <ref role="3cqZAo" node="2qsG4AwJiyq" resolve="tf1" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="3IIf9O_Z6oz" role="jymVt" />
@@ -5047,75 +5582,22 @@
       </node>
       <node concept="3Tm1VV" id="2qsG4AwKdr6" role="1B3o_S" />
       <node concept="3clFbS" id="2qsG4AwKdr7" role="3clF47">
-        <node concept="3cpWs8" id="2qsG4AwKdr8" role="3cqZAp">
-          <node concept="3cpWsn" id="2qsG4AwKdr9" role="3cpWs9">
-            <property role="TrG5h" value="tf1" />
-            <node concept="3uibUv" id="2qsG4AwKdra" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+        <node concept="3clFbF" id="6hpwxwivSzh" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwivTpm" role="3clFbG">
+            <node concept="1rXfSq" id="6hpwxwixiYc" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
             </node>
-            <node concept="2YIFZM" id="2qsG4AwKdrb" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2qsG4AwKdrc" role="37wK5m">
+            <node concept="liA8E" id="6hpwxwivVw7" role="2OqNvi">
+              <ref role="37wK5l" node="6hpwxwivwOV" resolve="forNodeAndConcept" />
+              <node concept="37vLTw" id="6hpwxwivVNl" role="37wK5m">
                 <ref role="3cqZAo" node="2qsG4AwKdr1" resolve="node" />
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2qsG4AwKdrd" role="3cqZAp">
-          <node concept="3cpWsn" id="2qsG4AwKdre" role="3cpWs9">
-            <property role="TrG5h" value="tf2" />
-            <node concept="3uibUv" id="2qsG4AwKdrf" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="2qsG4AwKw64" role="33vP2m">
-              <ref role="37wK5l" node="7Bx7XgEii_q" resolve="forConcept" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2qsG4AwKw65" role="37wK5m">
+              <node concept="37vLTw" id="6hpwxwivXWd" role="37wK5m">
                 <ref role="3cqZAo" node="2qsG4AwKdr3" resolve="concept" />
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="2qsG4AwKdri" role="3cqZAp" />
-        <node concept="3clFbJ" id="2qsG4AwKdrj" role="3cqZAp">
-          <node concept="3clFbS" id="2qsG4AwKdrk" role="3clFbx">
-            <node concept="YS8fn" id="2qsG4AwKdrl" role="3cqZAp">
-              <node concept="2ShNRf" id="2qsG4AwKdrm" role="YScLw">
-                <node concept="1pGfFk" id="2qsG4AwKdrn" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                  <node concept="Xl_RD" id="2qsG4AwKdro" role="37wK5m">
-                    <property role="Xl_RC" value="repositories differ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="2qsG4AwKdrp" role="3clFbw">
-            <node concept="2OqwBi" id="2qsG4AwKdrq" role="3uHU7w">
-              <node concept="37vLTw" id="2qsG4AwKdrr" role="2Oq$k0">
-                <ref role="3cqZAo" node="2qsG4AwKdre" resolve="tf2" />
-              </node>
-              <node concept="2OwXpG" id="2qsG4AwKdrs" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="2qsG4AwKdrt" role="3uHU7B">
-              <node concept="37vLTw" id="2qsG4AwKdru" role="2Oq$k0">
-                <ref role="3cqZAo" node="2qsG4AwKdr9" resolve="tf1" />
-              </node>
-              <node concept="2OwXpG" id="2qsG4AwKdrv" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2qsG4AwKdrw" role="3cqZAp" />
-        <node concept="3clFbF" id="2qsG4AwKdrx" role="3cqZAp">
-          <node concept="37vLTw" id="2qsG4AwKdry" role="3clFbG">
-            <ref role="3cqZAo" node="2qsG4AwKdr9" resolve="tf1" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2qsG4AwKdqZ" role="jymVt" />
@@ -5129,16 +5611,15 @@
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
       <node concept="3clFbS" id="7Bx7XgEii_v" role="3clF47">
-        <node concept="3clFbF" id="7Bx7XgEii_w" role="3cqZAp">
-          <node concept="2ShNRf" id="7Bx7XgEii_x" role="3clFbG">
-            <node concept="1pGfFk" id="7Bx7XgEii_y" role="2ShVmc">
-              <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
-              <node concept="2YIFZM" id="7Bx7XgEinBb" role="37wK5m">
-                <ref role="37wK5l" node="7Bx7XgEi3J2" resolve="repository" />
-                <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-                <node concept="37vLTw" id="7Bx7XgEinBc" role="37wK5m">
-                  <ref role="3cqZAo" node="7Bx7XgEii_r" resolve="concept" />
-                </node>
+        <node concept="3clFbF" id="6hpwxwivp5C" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwivpjb" role="3clFbG">
+            <node concept="1rXfSq" id="6hpwxwixkLO" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
+            </node>
+            <node concept="liA8E" id="6hpwxwivCqK" role="2OqNvi">
+              <ref role="37wK5l" node="6hpwxwivzi_" resolve="forConcept" />
+              <node concept="37vLTw" id="6hpwxwivCKy" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEii_r" resolve="concept" />
               </node>
             </node>
           </node>
@@ -5159,11 +5640,14 @@
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
       <node concept="3clFbS" id="1FOQehxzbI4" role="3clF47">
-        <node concept="3clFbF" id="1FOQehxzdzZ" role="3cqZAp">
-          <node concept="2ShNRf" id="1FOQehxzdzX" role="3clFbG">
-            <node concept="1pGfFk" id="1FOQehxzdPc" role="2ShVmc">
-              <ref role="37wK5l" node="7kaxm0sEBCn" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="1FOQehxzdTQ" role="37wK5m">
+        <node concept="3clFbF" id="6hpwxwivH7w" role="3cqZAp">
+          <node concept="2OqwBi" id="6hpwxwivHTJ" role="3clFbG">
+            <node concept="1rXfSq" id="6hpwxwixm_r" role="2Oq$k0">
+              <ref role="37wK5l" node="6hpwxwiwZuc" resolve="factory" />
+            </node>
+            <node concept="liA8E" id="6hpwxwivNZP" role="2OqNvi">
+              <ref role="37wK5l" node="6hpwxwiv_Ya" resolve="forRepository" />
+              <node concept="37vLTw" id="6hpwxwivOos" role="37wK5m">
                 <ref role="3cqZAo" node="1FOQehxzduN" resolve="repository" />
               </node>
             </node>
@@ -7943,114 +8427,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxnD2p" 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="1PaTwC" id="589APehYyjh" role="3ndbpf">
-                <node concept="3oM_SD" id="589APehYyji" role="1PaTwD">
-                  <property role="3oM_SC" value="FIXME" />
-                </node>
-                <node concept="3oM_SD" id="589APehYyjj" role="1PaTwD">
-                  <property role="3oM_SC" value="the" />
-                </node>
-                <node concept="3oM_SD" id="589APehYyjk" role="1PaTwD">
-                  <property role="3oM_SC" value="default" />
-                </node>
-                <node concept="3oM_SD" id="589APehYyjl" role="1PaTwD">
-                  <property role="3oM_SC" value="repository" />
-                </node>
-              </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()" 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()" 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="5KrJ7UHN1eb" role="jymVt" />
-    <node concept="2YIFZL" id="7Bx7XgEi3J2" role="jymVt">
-      <property role="TrG5h" value="repository" />
-      <property role="DiZV1" value="false" />
-      <property role="od$2w" value="false" />
-      <node concept="3clFbS" id="7Bx7XgEi3J3" role="3clF47">
-        <node concept="3clFbF" id="7Bx7XgEi7TK" role="3cqZAp">
-          <node concept="2OqwBi" id="7Bx7XgEi9$a" role="3clFbG">
-            <node concept="2OqwBi" id="7Bx7XgEi8VN" role="2Oq$k0">
-              <node concept="2OqwBi" id="7Bx7XgEi89$" role="2Oq$k0">
-                <node concept="37vLTw" id="7Bx7XgEi7TI" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7Bx7XgEi3Jt" resolve="concept" />
-                </node>
-                <node concept="liA8E" id="7Bx7XgEi8Pr" role="2OqNvi">
-                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
-                </node>
-              </node>
-              <node concept="liA8E" id="7Bx7XgEi9ts" role="2OqNvi">
-                <ref role="37wK5l" to="c17a:~SLanguage.getSourceModule()" resolve="getSourceModule" />
-              </node>
-            </node>
-            <node concept="liA8E" id="7Bx7XgEia9v" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~SModule.getRepository()" resolve="getRepository" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7Bx7XgEi3Jt" role="3clF46">
-        <property role="TrG5h" value="concept" />
-        <node concept="3bZ5Sz" id="7Bx7XgEi6oT" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7Bx7XgEi3Jv" role="3clF45">
-        <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-      </node>
-      <node concept="3Tm6S6" id="7Bx7XgEi3Jw" role="1B3o_S" />
-    </node>
     <node concept="2tJIrI" id="7Bx7XgEi3J1" role="jymVt" />
     <node concept="3Tm1VV" id="7kaxm0sEy3f" role="1B3o_S" />
     <node concept="312cEu" id="5MNibENhpkH" role="jymVt">
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 9567571a..3bfef711 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -274,9 +274,6 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
-      <concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
-        <child id="1221737317278" name="statementList" index="1Pe0a2" />
-      </concept>
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="1350122676458893092" name="text" index="3ndbpf" />
       </concept>
@@ -378,6 +375,7 @@
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
       <concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
+      <concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
         <child id="1197932505799" name="map" index="3ElQJh" />
@@ -392,6 +390,7 @@
   <node concept="2DaZZR" id="4QJVaOvIpzs" />
   <node concept="2uRRBC" id="3ywbauF4Q6s">
     <property role="TrG5h" value="ReactorLifecycleProxy" />
+    <property role="3GE5qa" value="lifecycle" />
     <node concept="2uRRBj" id="3ywbauF4QfJ" role="2uRRBE">
       <node concept="3clFbS" id="3ywbauF4QfK" role="2VODD2">
         <node concept="3clFbF" id="3ywbauF4QxD" role="3cqZAp">
@@ -7030,8 +7029,9 @@
       </node>
     </node>
     <node concept="2tJIrI" id="7iCybvTs2Au" role="jymVt" />
-    <node concept="1Pe0a1" id="2hrTH42P9C8" role="jymVt">
-      <node concept="3clFbS" id="2hrTH42P9Ca" role="1Pe0a2">
+    <node concept="2YIFZL" id="2tFDlV2co4z" role="jymVt">
+      <property role="TrG5h" value="init" />
+      <node concept="3clFbS" id="2tFDlV2clZ9" role="3clF47">
         <node concept="3clFbF" id="5gVsyvFqjgU" role="3cqZAp">
           <node concept="37vLTI" id="5gVsyvFqjgV" role="3clFbG">
             <node concept="2ShNRf" id="5gVsyvFqjgW" role="37vLTx">
@@ -7050,8 +7050,36 @@
           </node>
         </node>
       </node>
+      <node concept="3cqZAl" id="2tFDlV2clZ7" role="3clF45" />
+      <node concept="3Tmbuc" id="2tFDlV2cpoM" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="2hrTH42PbM5" role="jymVt" />
+    <node concept="2tJIrI" id="2tFDlV2cuT7" role="jymVt" />
+    <node concept="2YIFZL" id="2tFDlV2ct0G" role="jymVt">
+      <property role="TrG5h" value="dispose" />
+      <node concept="3clFbS" id="2tFDlV2ct0H" role="3clF47">
+        <node concept="3clFbF" id="2tFDlV2cxfF" role="3cqZAp">
+          <node concept="2OqwBi" id="2tFDlV2cxlU" role="3clFbG">
+            <node concept="37vLTw" id="2tFDlV2cxfD" role="2Oq$k0">
+              <ref role="3cqZAo" node="7iCybvTsa$U" resolve="INSTANCE" />
+            </node>
+            <node concept="liA8E" id="2tFDlV2da$k" role="2OqNvi">
+              <ref role="37wK5l" node="2tFDlV2cWxE" resolve="clearAll" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2tFDlV2cyPt" role="3cqZAp">
+          <node concept="37vLTI" id="2tFDlV2cz90" role="3clFbG">
+            <node concept="10Nm6u" id="2tFDlV2czay" role="37vLTx" />
+            <node concept="37vLTw" id="2tFDlV2cyPr" role="37vLTJ">
+              <ref role="3cqZAo" node="7iCybvTsa$U" resolve="INSTANCE" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2tFDlV2ct0P" role="3clF45" />
+      <node concept="3Tmbuc" id="2tFDlV2ct0Q" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2tFDlV2cjbA" role="jymVt" />
     <node concept="2YIFZL" id="7iCybvTs3lI" role="jymVt">
       <property role="TrG5h" value="getInstance" />
       <node concept="3uibUv" id="7iCybvTs47V" role="3clF45">
@@ -7065,202 +7093,37 @@
           </node>
         </node>
       </node>
-      <node concept="P$JXv" id="7iCybvTs4J6" role="lGtFl">
-        <node concept="TZ5HA" id="7iCybvTs4J7" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTs4J8" role="1dT_Ay">
-            <property role="1dT_AB" value="Returns effective options." />
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="7iCybvTs0IM" role="jymVt" />
-    <node concept="2YIFZL" id="7iCybvT$T_P" role="jymVt">
-      <property role="TrG5h" value="getValue" />
-      <node concept="37vLTG" id="7iCybvT$YVc" role="3clF46">
-        <property role="TrG5h" value="option" />
-        <node concept="3uibUv" id="7iCybvT$Zbo" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvT$$S3" resolve="Config.Option" />
-          <node concept="16syzq" id="7iCybvT$ZwO" role="11_B2D">
-            <ref role="16sUi3" node="7iCybvT$YMT" resolve="T" />
-          </node>
-        </node>
-      </node>
-      <node concept="16syzq" id="7iCybvT_aer" role="3clF45">
-        <ref role="16sUi3" node="7iCybvT$YMT" resolve="T" />
-      </node>
-      <node concept="3Tm1VV" id="7iCybvT$T_S" role="1B3o_S" />
-      <node concept="3clFbS" id="7iCybvT$T_T" role="3clF47">
-        <node concept="3clFbF" id="7iCybvT$ZST" role="3cqZAp">
-          <node concept="2OqwBi" id="7iCybvT_09O" role="3clFbG">
-            <node concept="37vLTw" id="7iCybvT$ZSS" role="2Oq$k0">
-              <ref role="3cqZAo" node="7iCybvT$YVc" resolve="option" />
-            </node>
-            <node concept="liA8E" id="7iCybvT_0t9" role="2OqNvi">
-              <ref role="37wK5l" node="7iCybvT$ANq" resolve="get" />
-              <node concept="1rXfSq" id="7iCybvT_0_i" role="37wK5m">
-                <ref role="37wK5l" node="7iCybvTs3lI" resolve="getInstance" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="16euLQ" id="7iCybvT$YMT" role="16eVyc">
-        <property role="TrG5h" value="T" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7iCybvT$S2B" role="jymVt" />
-    <node concept="3clFb_" id="7iCybvTszk9" role="jymVt">
-      <property role="TrG5h" value="registerProvider" />
-      <node concept="3clFbS" id="7iCybvToL4K" role="3clF47">
-        <node concept="1HWtB8" id="5dfEAcSqs0s" role="3cqZAp">
-          <node concept="37vLTw" id="5dfEAcSqs4C" role="1HWFw0">
-            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-          </node>
-          <node concept="3clFbS" id="5dfEAcSqs0w" role="1HWHxc">
-            <node concept="3clFbF" id="7iCybvTvcna" role="3cqZAp">
-              <node concept="2OqwBi" id="7iCybvTvcxN" role="3clFbG">
-                <node concept="37vLTw" id="7iCybvTvcn9" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-                </node>
-                <node concept="liA8E" id="7iCybvTvcKl" role="2OqNvi">
-                  <ref role="37wK5l" node="7iCybvTtBza" resolve="registerProvider" />
-                  <node concept="37vLTw" id="7iCybvTvcXf" role="37wK5m">
-                    <ref role="3cqZAo" node="7iCybvToLCK" resolve="level" />
-                  </node>
-                  <node concept="37vLTw" id="7iCybvTvd9W" role="37wK5m">
-                    <ref role="3cqZAo" node="7iCybvToOoN" resolve="prefix" />
-                  </node>
-                  <node concept="37vLTw" id="7iCybvTvduq" role="37wK5m">
-                    <ref role="3cqZAo" node="7iCybvToLVE" resolve="provider" />
-                  </node>
+    <node concept="2YIFZL" id="6hpwxwiHYr2" role="jymVt">
+      <property role="TrG5h" value="create" />
+      <node concept="3clFbS" id="6hpwxwiHTtq" role="3clF47">
+        <node concept="3clFbF" id="6hpwxwiI9h6" role="3cqZAp">
+          <node concept="2ShNRf" id="6hpwxwiI9h8" role="3clFbG">
+            <node concept="1pGfFk" id="6hpwxwiI9h9" role="2ShVmc">
+              <ref role="37wK5l" node="7iCybvTs5N5" resolve="Config" />
+              <node concept="2ShNRf" id="6hpwxwiI9ha" role="37wK5m">
+                <node concept="1pGfFk" id="6hpwxwiI9hb" role="2ShVmc">
+                  <ref role="37wK5l" node="7iCybvTsdu8" resolve="Config.EffectiveOptions" />
                 </node>
               </node>
             </node>
           </node>
         </node>
       </node>
-      <node concept="37vLTG" id="7iCybvToLCK" role="3clF46">
-        <property role="TrG5h" value="level" />
-        <node concept="3uibUv" id="7iCybvToLLw" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToD3Z" resolve="Config.Level" />
-        </node>
+      <node concept="3uibUv" id="6hpwxwiI64L" role="3clF45">
+        <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
       </node>
-      <node concept="37vLTG" id="7iCybvToOoN" role="3clF46">
-        <property role="TrG5h" value="prefix" />
-        <node concept="17QB3L" id="7iCybvToOxB" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7iCybvToLVE" role="3clF46">
-        <property role="TrG5h" value="provider" />
-        <node concept="3uibUv" id="7iCybvToNTj" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToMqc" resolve="Config.OptionsProvider" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7iCybvToL4I" role="3clF45" />
-      <node concept="P$JXv" id="7iCybvTp7YY" role="lGtFl">
-        <node concept="TZ5HA" id="7iCybvTp7YZ" role="TZ5H$">
-          <node concept="1dT_AC" id="7iCybvTp7Z0" role="1dT_Ay">
-            <property role="1dT_AB" value="A prefix is defined as a string matching the following RE: &quot;([a-zA-Z0-9]*\.)+&quot; ." />
-          </node>
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="7iCybvToL4J" role="1B3o_S" />
-    </node>
-    <node concept="2tJIrI" id="7iCybvTt0Zw" role="jymVt" />
-    <node concept="3clFb_" id="7prluhlHqSp" role="jymVt">
-      <property role="TrG5h" value="clearProvider" />
-      <node concept="3cqZAl" id="7prluhlHqSr" role="3clF45" />
-      <node concept="3Tm1VV" id="7prluhlHqSs" role="1B3o_S" />
-      <node concept="3clFbS" id="7prluhlHqSt" role="3clF47">
-        <node concept="1HWtB8" id="5J3mLjaFwvZ" role="3cqZAp">
-          <node concept="37vLTw" id="5J3mLjaFwz4" role="1HWFw0">
-            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-          </node>
-          <node concept="3clFbS" id="5J3mLjaFww3" role="1HWHxc">
-            <node concept="3clFbF" id="7prluhlHyAm" role="3cqZAp">
-              <node concept="2OqwBi" id="7prluhlHyAn" role="3clFbG">
-                <node concept="liA8E" id="7prluhlHyAo" role="2OqNvi">
-                  <ref role="37wK5l" node="7prluhlHKlE" resolve="clearProvider" />
-                  <node concept="37vLTw" id="7prluhlId6r" role="37wK5m">
-                    <ref role="3cqZAo" node="7prluhlHv8$" resolve="lvl" />
-                  </node>
-                  <node concept="37vLTw" id="7prluhlIcTg" role="37wK5m">
-                    <ref role="3cqZAo" node="7prluhlHvte" resolve="prefix" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="7prluhlHyAq" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="7prluhlHv8$" role="3clF46">
-        <property role="TrG5h" value="lvl" />
-        <node concept="3uibUv" id="7prluhlHv8z" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToD3Z" resolve="Config.Level" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="7prluhlHvte" role="3clF46">
-        <property role="TrG5h" value="prefix" />
-        <node concept="3uibUv" id="7prluhlHxfU" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="7prluhlHkf_" role="jymVt" />
-    <node concept="3clFb_" id="7iCybvToiWV" role="jymVt">
-      <property role="TrG5h" value="getOption" />
-      <property role="DiZV1" value="true" />
-      <node concept="37vLTG" id="7iCybvTokpe" role="3clF46">
-        <property role="TrG5h" value="key" />
-        <node concept="17QB3L" id="5dfEAcSBiyK" role="1tU5fm" />
-      </node>
-      <node concept="3uibUv" id="7iCybvToj0j" role="3clF45">
-        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-      </node>
-      <node concept="3Tm1VV" id="7iCybvToiWY" role="1B3o_S" />
-      <node concept="3clFbS" id="7iCybvToiWZ" role="3clF47">
-        <node concept="3cpWs8" id="7iCybvTqsjt" role="3cqZAp">
-          <node concept="3cpWsn" id="7iCybvTqsju" role="3cpWs9">
-            <property role="TrG5h" value="allPrefixes" />
-            <node concept="_YKpA" id="7iCybvTvq_r" role="1tU5fm">
-              <node concept="17QB3L" id="7iCybvTvrc_" role="_ZDj9" />
-            </node>
-            <node concept="1rXfSq" id="7iCybvTqsjv" role="33vP2m">
-              <ref role="37wK5l" node="7iCybvTp53X" resolve="allPrefixes" />
-              <node concept="37vLTw" id="7iCybvTqsjw" role="37wK5m">
-                <ref role="3cqZAo" node="7iCybvTokpe" resolve="key" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1HWtB8" id="5dfEAcSqsOU" role="3cqZAp">
-          <node concept="37vLTw" id="5dfEAcSqsWo" role="1HWFw0">
-            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-          </node>
-          <node concept="3clFbS" id="5dfEAcSqsOY" role="1HWHxc">
-            <node concept="3cpWs6" id="5dfEAcSqtY5" role="3cqZAp">
-              <node concept="2OqwBi" id="5dfEAcSqtY6" role="3cqZAk">
-                <node concept="37vLTw" id="5dfEAcSqtY7" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
-                </node>
-                <node concept="liA8E" id="5dfEAcSqtY8" role="2OqNvi">
-                  <ref role="37wK5l" node="7iCybvTtqma" resolve="primGetOption" />
-                  <node concept="37vLTw" id="5dfEAcSqtY9" role="37wK5m">
-                    <ref role="3cqZAo" node="7iCybvTokpe" resolve="key" />
-                  </node>
-                  <node concept="37vLTw" id="5dfEAcSqtYa" role="37wK5m">
-                    <ref role="3cqZAo" node="7iCybvTqsju" resolve="allPrefixes" />
-                  </node>
-                </node>
-              </node>
-            </node>
+      <node concept="3Tm1VV" id="6hpwxwiHTtp" role="1B3o_S" />
+      <node concept="P$JXv" id="6hpwxwiIihH" role="lGtFl">
+        <node concept="TZ5HA" id="6hpwxwiIihI" role="TZ5H$">
+          <node concept="1dT_AC" id="6hpwxwiIihJ" role="1dT_Ay">
+            <property role="1dT_AB" value="Used from tests." />
           </node>
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="7iCybvTq5Ry" role="jymVt" />
+    <node concept="2tJIrI" id="7iCybvTucuM" role="jymVt" />
     <node concept="3clFb_" id="xqbf82kuzw" role="jymVt">
       <property role="TrG5h" value="reset" />
       <node concept="3clFbS" id="7iCybvTu6L3" role="3clF47">
@@ -7294,17 +7157,9 @@
       </node>
       <node concept="3Tm1VV" id="7iCybvTuEmz" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="7iCybvTucuM" role="jymVt" />
-    <node concept="3clFb_" id="7iCybvTp53X" role="jymVt">
+    <node concept="2tJIrI" id="6hpwxwiHOyx" role="jymVt" />
+    <node concept="2YIFZL" id="2tFDlV2cNyX" role="jymVt">
       <property role="TrG5h" value="allPrefixes" />
-      <node concept="37vLTG" id="7iCybvTp6Ep" role="3clF46">
-        <property role="TrG5h" value="key" />
-        <node concept="17QB3L" id="7iCybvTp6Wk" role="1tU5fm" />
-      </node>
-      <node concept="_YKpA" id="7iCybvTv_Of" role="3clF45">
-        <node concept="17QB3L" id="7iCybvTv_Oh" role="_ZDj9" />
-      </node>
-      <node concept="3Tmbuc" id="7iCybvTpTd2" role="1B3o_S" />
       <node concept="3clFbS" id="7iCybvTp541" role="3clF47">
         <node concept="3cpWs8" id="7iCybvTpcX5" role="3cqZAp">
           <node concept="3cpWsn" id="7iCybvTpcX6" role="3cpWs9">
@@ -7421,8 +7276,205 @@
           </node>
         </node>
       </node>
+      <node concept="37vLTG" id="7iCybvTp6Ep" role="3clF46">
+        <property role="TrG5h" value="key" />
+        <node concept="17QB3L" id="7iCybvTp6Wk" role="1tU5fm" />
+      </node>
+      <node concept="_YKpA" id="7iCybvTv_Of" role="3clF45">
+        <node concept="17QB3L" id="7iCybvTv_Oh" role="_ZDj9" />
+      </node>
+      <node concept="3Tmbuc" id="7iCybvTpTd2" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="7iCybvTsBAL" role="jymVt" />
+    <node concept="2tJIrI" id="7iCybvT$S2B" role="jymVt" />
+    <node concept="3clFb_" id="7iCybvTszk9" role="jymVt">
+      <property role="TrG5h" value="registerProvider" />
+      <node concept="3clFbS" id="7iCybvToL4K" role="3clF47">
+        <node concept="1HWtB8" id="5dfEAcSqs0s" role="3cqZAp">
+          <node concept="37vLTw" id="5dfEAcSqs4C" role="1HWFw0">
+            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+          </node>
+          <node concept="3clFbS" id="5dfEAcSqs0w" role="1HWHxc">
+            <node concept="3clFbF" id="7iCybvTvcna" role="3cqZAp">
+              <node concept="2OqwBi" id="7iCybvTvcxN" role="3clFbG">
+                <node concept="37vLTw" id="7iCybvTvcn9" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+                </node>
+                <node concept="liA8E" id="7iCybvTvcKl" role="2OqNvi">
+                  <ref role="37wK5l" node="7iCybvTtBza" resolve="registerProvider" />
+                  <node concept="37vLTw" id="7iCybvTvcXf" role="37wK5m">
+                    <ref role="3cqZAo" node="7iCybvToLCK" resolve="level" />
+                  </node>
+                  <node concept="37vLTw" id="7iCybvTvd9W" role="37wK5m">
+                    <ref role="3cqZAo" node="7iCybvToOoN" resolve="prefix" />
+                  </node>
+                  <node concept="37vLTw" id="7iCybvTvduq" role="37wK5m">
+                    <ref role="3cqZAo" node="7iCybvToLVE" resolve="provider" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7iCybvToLCK" role="3clF46">
+        <property role="TrG5h" value="level" />
+        <node concept="3uibUv" id="7iCybvToLLw" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToD3Z" resolve="Config.Level" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7iCybvToOoN" role="3clF46">
+        <property role="TrG5h" value="prefix" />
+        <node concept="17QB3L" id="7iCybvToOxB" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7iCybvToLVE" role="3clF46">
+        <property role="TrG5h" value="provider" />
+        <node concept="3uibUv" id="7iCybvToNTj" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToMqc" resolve="Config.OptionsProvider" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7iCybvToL4I" role="3clF45" />
+      <node concept="P$JXv" id="7iCybvTp7YY" role="lGtFl">
+        <node concept="TZ5HA" id="7iCybvTp7YZ" role="TZ5H$">
+          <node concept="1dT_AC" id="7iCybvTp7Z0" role="1dT_Ay">
+            <property role="1dT_AB" value="A prefix is defined as a string matching the following RE: &quot;([a-zA-Z0-9]*\.)+&quot; ." />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="7iCybvToL4J" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7iCybvTt0Zw" role="jymVt" />
+    <node concept="3clFb_" id="7prluhlHqSp" role="jymVt">
+      <property role="TrG5h" value="clearProvider" />
+      <node concept="3cqZAl" id="7prluhlHqSr" role="3clF45" />
+      <node concept="3Tm1VV" id="7prluhlHqSs" role="1B3o_S" />
+      <node concept="3clFbS" id="7prluhlHqSt" role="3clF47">
+        <node concept="1HWtB8" id="5J3mLjaFwvZ" role="3cqZAp">
+          <node concept="37vLTw" id="5J3mLjaFwz4" role="1HWFw0">
+            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+          </node>
+          <node concept="3clFbS" id="5J3mLjaFww3" role="1HWHxc">
+            <node concept="3clFbF" id="7prluhlHyAm" role="3cqZAp">
+              <node concept="2OqwBi" id="7prluhlHyAn" role="3clFbG">
+                <node concept="liA8E" id="7prluhlHyAo" role="2OqNvi">
+                  <ref role="37wK5l" node="7prluhlHKlE" resolve="clearProvider" />
+                  <node concept="37vLTw" id="7prluhlId6r" role="37wK5m">
+                    <ref role="3cqZAo" node="7prluhlHv8$" resolve="lvl" />
+                  </node>
+                  <node concept="37vLTw" id="7prluhlIcTg" role="37wK5m">
+                    <ref role="3cqZAo" node="7prluhlHvte" resolve="prefix" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7prluhlHyAq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7prluhlHv8$" role="3clF46">
+        <property role="TrG5h" value="lvl" />
+        <node concept="3uibUv" id="7prluhlHv8z" role="1tU5fm">
+          <ref role="3uigEE" node="7iCybvToD3Z" resolve="Config.Level" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7prluhlHvte" role="3clF46">
+        <property role="TrG5h" value="prefix" />
+        <node concept="17QB3L" id="6hpwxwiISvc" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7prluhlHkf_" role="jymVt" />
+    <node concept="3clFb_" id="7iCybvToiWV" role="jymVt">
+      <property role="TrG5h" value="getOption" />
+      <property role="DiZV1" value="true" />
+      <node concept="37vLTG" id="7iCybvTokpe" role="3clF46">
+        <property role="TrG5h" value="key" />
+        <node concept="17QB3L" id="5dfEAcSBiyK" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="7iCybvToj0j" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+      <node concept="3Tm1VV" id="7iCybvToiWY" role="1B3o_S" />
+      <node concept="3clFbS" id="7iCybvToiWZ" role="3clF47">
+        <node concept="3cpWs8" id="7iCybvTqsjt" role="3cqZAp">
+          <node concept="3cpWsn" id="7iCybvTqsju" role="3cpWs9">
+            <property role="TrG5h" value="allPrefixes" />
+            <node concept="_YKpA" id="7iCybvTvq_r" role="1tU5fm">
+              <node concept="17QB3L" id="7iCybvTvrc_" role="_ZDj9" />
+            </node>
+            <node concept="1rXfSq" id="7iCybvTqsjv" role="33vP2m">
+              <ref role="37wK5l" node="2tFDlV2cNyX" resolve="allPrefixes" />
+              <node concept="37vLTw" id="7iCybvTqsjw" role="37wK5m">
+                <ref role="3cqZAo" node="7iCybvTokpe" resolve="key" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1HWtB8" id="5dfEAcSqsOU" role="3cqZAp">
+          <node concept="37vLTw" id="5dfEAcSqsWo" role="1HWFw0">
+            <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+          </node>
+          <node concept="3clFbS" id="5dfEAcSqsOY" role="1HWHxc">
+            <node concept="3cpWs6" id="5dfEAcSqtY5" role="3cqZAp">
+              <node concept="2OqwBi" id="5dfEAcSqtY6" role="3cqZAk">
+                <node concept="37vLTw" id="5dfEAcSqtY7" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+                </node>
+                <node concept="liA8E" id="5dfEAcSqtY8" role="2OqNvi">
+                  <ref role="37wK5l" node="7iCybvTtqma" resolve="primGetOption" />
+                  <node concept="37vLTw" id="5dfEAcSqtY9" role="37wK5m">
+                    <ref role="3cqZAo" node="7iCybvTokpe" resolve="key" />
+                  </node>
+                  <node concept="37vLTw" id="5dfEAcSqtYa" role="37wK5m">
+                    <ref role="3cqZAo" node="7iCybvTqsju" resolve="allPrefixes" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7iCybvTq5Ry" role="jymVt" />
+    <node concept="3clFb_" id="2tFDlV2cWxE" role="jymVt">
+      <property role="TrG5h" value="clearAll" />
+      <node concept="3clFbS" id="2tFDlV2cTLe" role="3clF47">
+        <node concept="3clFbJ" id="6hpwxwiIU6T" role="3cqZAp">
+          <node concept="3clFbS" id="6hpwxwiIU6V" role="3clFbx">
+            <node concept="3clFbF" id="2tFDlV2cYPV" role="3cqZAp">
+              <node concept="2OqwBi" id="2tFDlV2cZeA" role="3clFbG">
+                <node concept="37vLTw" id="2tFDlV2cYPU" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+                </node>
+                <node concept="liA8E" id="2tFDlV2cZBE" role="2OqNvi">
+                  <ref role="37wK5l" node="2tFDlV2c_F8" resolve="clearAll" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="2tFDlV2d00W" role="3cqZAp">
+              <node concept="37vLTI" id="2tFDlV2d0Ke" role="3clFbG">
+                <node concept="10Nm6u" id="2tFDlV2d0Yp" role="37vLTx" />
+                <node concept="2OqwBi" id="2tFDlV2d08T" role="37vLTJ">
+                  <node concept="Xjq3P" id="2tFDlV2d00U" role="2Oq$k0" />
+                  <node concept="2OwXpG" id="2tFDlV2d0ky" role="2OqNvi">
+                    <ref role="2Oxat5" node="7iCybvTsVZN" resolve="effectiveOptions" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6hpwxwiIUvm" role="3clFbw">
+            <node concept="10Nm6u" id="6hpwxwiIUw3" role="3uHU7w" />
+            <node concept="37vLTw" id="6hpwxwiIUaj" role="3uHU7B">
+              <ref role="3cqZAo" node="7iCybvTsVZN" resolve="effectiveOptions" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2tFDlV2cTLc" role="3clF45" />
+      <node concept="3Tmbuc" id="2tFDlV2cVEq" role="1B3o_S" />
+    </node>
     <node concept="2tJIrI" id="7iCybvTsBAO" role="jymVt" />
     <node concept="3clFbW" id="7iCybvTs5N5" role="jymVt">
       <node concept="3cqZAl" id="7iCybvTs5N7" role="3clF45" />
@@ -8078,6 +8130,44 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="2tFDlV2c$0f" role="jymVt" />
+      <node concept="3clFb_" id="2tFDlV2c_F8" role="jymVt">
+        <property role="TrG5h" value="clearAll" />
+        <node concept="3cqZAl" id="2tFDlV2c_Fa" role="3clF45" />
+        <node concept="3Tmbuc" id="2tFDlV2cB9U" role="1B3o_S" />
+        <node concept="3clFbS" id="2tFDlV2c_Fc" role="3clF47">
+          <node concept="3clFbF" id="2tFDlV2cF7j" role="3cqZAp">
+            <node concept="2OqwBi" id="2tFDlV2cFVP" role="3clFbG">
+              <node concept="37vLTw" id="2tFDlV2cF7i" role="2Oq$k0">
+                <ref role="3cqZAo" node="7iCybvTsduC" resolve="allOptions" />
+              </node>
+              <node concept="1yHZxX" id="2tFDlV2cGol" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="2tFDlV2cInZ" role="3cqZAp">
+            <node concept="37vLTI" id="2tFDlV2cJwy" role="3clFbG">
+              <node concept="10Nm6u" id="2tFDlV2cJ$F" role="37vLTx" />
+              <node concept="2OqwBi" id="2tFDlV2cITE" role="37vLTJ">
+                <node concept="Xjq3P" id="2tFDlV2cInX" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2tFDlV2cKaD" role="2OqNvi">
+                  <ref role="2Oxat5" node="7iCybvTsduC" resolve="allOptions" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2tFDlV2cGP5" role="3cqZAp">
+            <node concept="37vLTI" id="2tFDlV2cHPk" role="3clFbG">
+              <node concept="10Nm6u" id="2tFDlV2cHVl" role="37vLTx" />
+              <node concept="2OqwBi" id="2tFDlV2cH42" role="37vLTJ">
+                <node concept="Xjq3P" id="2tFDlV2cGP3" role="2Oq$k0" />
+                <node concept="2OwXpG" id="2tFDlV2cHl5" role="2OqNvi">
+                  <ref role="2Oxat5" node="7iCybvTswV3" resolve="options" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="7iCybvTtAWW" role="jymVt" />
       <node concept="3clFb_" id="7iCybvTtqma" role="jymVt">
         <property role="TrG5h" value="primGetOption" />
@@ -8216,5 +8306,29 @@
       </node>
     </node>
   </node>
+  <node concept="2uRRBC" id="2tFDlV2cieZ">
+    <property role="3GE5qa" value="lifecycle" />
+    <property role="TrG5h" value="ConfigLifecycle" />
+    <node concept="2uRRBj" id="2tFDlV2cifr" role="2uRRBE">
+      <node concept="3clFbS" id="2tFDlV2cifs" role="2VODD2">
+        <node concept="3clFbF" id="2tFDlV2dcFL" role="3cqZAp">
+          <node concept="2YIFZM" id="2tFDlV2ddvn" role="3clFbG">
+            <ref role="37wK5l" node="2tFDlV2co4z" resolve="init" />
+            <ref role="1Pybhc" node="7iCybvToiT5" resolve="Config" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2uRRBI" id="2tFDlV2cifL" role="2uRRBF">
+      <node concept="3clFbS" id="2tFDlV2cifM" role="2VODD2">
+        <node concept="3clFbF" id="2tFDlV2deiY" role="3cqZAp">
+          <node concept="2YIFZM" id="2tFDlV2dfVk" role="3clFbG">
+            <ref role="37wK5l" node="2tFDlV2ct0G" resolve="dispose" />
+            <ref role="1Pybhc" node="7iCybvToiT5" resolve="Config" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>