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 041c4b1a..c16050e8 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
@@ -7321,271 +7321,262 @@
           <node concept="3clFbH" id="7WKNeR8SQyz" role="3cqZAp" />
           <node concept="3clFbF" id="7WKNeR8SQy$" role="3cqZAp">
             <node concept="2OqwBi" id="7WKNeR8SQy_" role="3clFbG">
-              <node concept="2OqwBi" id="AjlLkeilMq" role="2Oq$k0">
-                <node concept="2ShNRf" id="7WKNeR8SQyA" role="2Oq$k0">
-                  <node concept="1pGfFk" id="7WKNeR8SQyB" role="2ShVmc">
-                    <ref role="37wK5l" to="1yqb:1pPth$lK1ZL" resolve="CoderulesHelper" />
-                    <node concept="37vLTw" id="7W7Inqm62NJ" role="37wK5m">
-                      <ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
-                    </node>
-                    <node concept="2ShNRf" id="7WKNeR8SQyC" role="37wK5m">
-                      <node concept="YeOm9" id="7WKNeR8SQyD" role="2ShVmc">
-                        <node concept="1Y3b0j" id="7WKNeR8SQyE" role="YeSDq">
-                          <property role="2bfB8j" value="true" />
-                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <ref role="1Y3XeK" to="1yqb:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
-                          <node concept="3Tm1VV" id="7WKNeR8SQyF" role="1B3o_S" />
-                          <node concept="3clFb_" id="3MwxBzG61n7" role="jymVt">
-                            <property role="TrG5h" value="done" />
-                            <node concept="37vLTG" id="3MwxBzG61n8" role="3clF46">
-                              <property role="TrG5h" value="message" />
-                              <node concept="17QB3L" id="3MwxBzG61n9" role="1tU5fm" />
+              <node concept="2ShNRf" id="7WKNeR8SQyA" role="2Oq$k0">
+                <node concept="1pGfFk" id="7WKNeR8SQyB" role="2ShVmc">
+                  <ref role="37wK5l" to="1yqb:1pPth$lK1ZL" resolve="CoderulesHelper" />
+                  <node concept="37vLTw" id="7W7Inqm62NJ" role="37wK5m">
+                    <ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
+                  </node>
+                  <node concept="2ShNRf" id="7WKNeR8SQyC" role="37wK5m">
+                    <node concept="YeOm9" id="7WKNeR8SQyD" role="2ShVmc">
+                      <node concept="1Y3b0j" id="7WKNeR8SQyE" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <ref role="1Y3XeK" to="1yqb:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
+                        <node concept="3Tm1VV" id="7WKNeR8SQyF" role="1B3o_S" />
+                        <node concept="3clFb_" id="3MwxBzG61n7" role="jymVt">
+                          <property role="TrG5h" value="done" />
+                          <node concept="37vLTG" id="3MwxBzG61n8" role="3clF46">
+                            <property role="TrG5h" value="message" />
+                            <node concept="17QB3L" id="3MwxBzG61n9" role="1tU5fm" />
+                          </node>
+                          <node concept="37vLTG" id="3MwxBzG61na" role="3clF46">
+                            <property role="TrG5h" value="result" />
+                            <node concept="3uibUv" id="3MwxBzG61nb" role="1tU5fm">
+                              <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
                             </node>
-                            <node concept="37vLTG" id="3MwxBzG61na" role="3clF46">
-                              <property role="TrG5h" value="result" />
-                              <node concept="3uibUv" id="3MwxBzG61nb" role="1tU5fm">
-                                <ref role="3uigEE" to="psoy:7Oc59RSEjdb" resolve="Result" />
+                          </node>
+                          <node concept="3cqZAl" id="3MwxBzG61nc" role="3clF45" />
+                          <node concept="3Tm1VV" id="3MwxBzG61nd" role="1B3o_S" />
+                          <node concept="3clFbS" id="3MwxBzG61ng" role="3clF47">
+                            <node concept="3SKdUt" id="4qGA5WDXC6I" role="3cqZAp">
+                              <node concept="1PaTwC" id="4qGA5WDXC6J" role="1aUNEU">
+                                <node concept="3oM_SD" id="4qGA5WDXDa5" role="1PaTwD">
+                                  <property role="3oM_SC" value="log" />
+                                </node>
                               </node>
                             </node>
-                            <node concept="3cqZAl" id="3MwxBzG61nc" role="3clF45" />
-                            <node concept="3Tm1VV" id="3MwxBzG61nd" role="1B3o_S" />
-                            <node concept="3clFbS" id="3MwxBzG61ng" role="3clF47">
-                              <node concept="3SKdUt" id="4qGA5WDXC6I" role="3cqZAp">
-                                <node concept="1PaTwC" id="4qGA5WDXC6J" role="1aUNEU">
-                                  <node concept="3oM_SD" id="4qGA5WDXDa5" role="1PaTwD">
-                                    <property role="3oM_SC" value="log" />
+                            <node concept="3clFbJ" id="4qGA5WE41Fb" role="3cqZAp">
+                              <node concept="3clFbS" id="4qGA5WE41Fd" role="3clFbx">
+                                <node concept="3cpWs8" id="4qGA5WE49BU" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49BV" role="3cpWs9">
+                                    <property role="TrG5h" value="kind" />
+                                    <node concept="3uibUv" id="4qGA5WE49BW" role="1tU5fm">
+                                      <ref role="3uigEE" to="et5u:~MessageKind" resolve="MessageKind" />
+                                    </node>
+                                    <node concept="3K4zz7" id="6gnqipLtKIH" role="33vP2m">
+                                      <node concept="Rm8GO" id="6cGbuqOdzx8" role="3K4E3e">
+                                        <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                                      </node>
+                                      <node concept="Rm8GO" id="6cGbuqOd$Q2" role="3K4GZi">
+                                        <ref role="Rm8GQ" to="et5u:~MessageKind.ERROR" resolve="ERROR" />
+                                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                                      </node>
+                                      <node concept="2OqwBi" id="4qGA5WDVGuH" role="3K4Cdx">
+                                        <node concept="37vLTw" id="4qGA5WDVFXY" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                        </node>
+                                        <node concept="liA8E" id="6cGbuqOdylK" role="2OqNvi">
+                                          <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4qGA5WE49BX" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49BY" role="3cpWs9">
+                                    <property role="TrG5h" value="cause" />
+                                    <node concept="3uibUv" id="4qGA5WE49BZ" role="1tU5fm">
+                                      <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
+                                    </node>
+                                    <node concept="2OqwBi" id="6cGbuqOoY1R" role="33vP2m">
+                                      <node concept="37vLTw" id="6cGbuqOoWFI" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                      </node>
+                                      <node concept="liA8E" id="6cGbuqOoZ0e" role="2OqNvi">
+                                        <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3cpWs8" id="4qGA5WE49C8" role="3cqZAp">
+                                  <node concept="3cpWsn" id="4qGA5WE49C9" role="3cpWs9">
+                                    <property role="TrG5h" value="msg" />
+                                    <node concept="3uibUv" id="4qGA5WE49Ca" role="1tU5fm">
+                                      <ref role="3uigEE" to="et5u:~Message" resolve="Message" />
+                                    </node>
+                                    <node concept="2ShNRf" id="4qGA5WE49Cb" role="33vP2m">
+                                      <node concept="1pGfFk" id="4qGA5WE49Cc" role="2ShVmc">
+                                        <ref role="37wK5l" to="et5u:~Message.&lt;init&gt;(jetbrains.mps.messages.MessageKind,java.lang.String)" resolve="Message" />
+                                        <node concept="37vLTw" id="4qGA5WE49Cd" role="37wK5m">
+                                          <ref role="3cqZAo" node="4qGA5WE49BV" resolve="kind" />
+                                        </node>
+                                        <node concept="2OqwBi" id="4qGA5WE49Ce" role="37wK5m">
+                                          <node concept="37vLTw" id="4qGA5WE49Cf" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                          </node>
+                                          <node concept="liA8E" id="4qGA5WE49Cg" role="2OqNvi">
+                                            <ref role="37wK5l" to="psoy:7Oc59RSJr0t" resolve="toString" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4qGA5WE49Ch" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4qGA5WE49Ci" role="3clFbG">
+                                    <node concept="37vLTw" id="4qGA5WE49Cj" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
+                                    </node>
+                                    <node concept="liA8E" id="4qGA5WE49Ck" role="2OqNvi">
+                                      <ref role="37wK5l" to="et5u:~Message.setException(java.lang.Throwable)" resolve="setException" />
+                                      <node concept="37vLTw" id="4qGA5WE49Cl" role="37wK5m">
+                                        <ref role="3cqZAo" node="4qGA5WE49BY" resolve="cause" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="4qGA5WDVyB7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4qGA5WDVz9r" role="3clFbG">
+                                    <node concept="2YIFZM" id="4qGA5WDXXjg" role="2Oq$k0">
+                                      <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                                      <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
+                                      <node concept="37vLTw" id="4qGA5WDY0gH" role="37wK5m">
+                                        <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
+                                      </node>
+                                    </node>
+                                    <node concept="liA8E" id="4qGA5WDVzx0" role="2OqNvi">
+                                      <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
+                                      <node concept="37vLTw" id="4qGA5WDW9OW" role="37wK5m">
+                                        <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="6cGbuqOmSB7" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6cGbuqOmTJT" role="3clFbG">
+                                    <node concept="37vLTw" id="6cGbuqOmSB5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                    </node>
+                                    <node concept="liA8E" id="6cGbuqOmV81" role="2OqNvi">
+                                      <ref role="37wK5l" to="psoy:6cGbuqOk51p" resolve="clearCause" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="4qGA5WE41Fb" role="3cqZAp">
-                                <node concept="3clFbS" id="4qGA5WE41Fd" role="3clFbx">
-                                  <node concept="3cpWs8" id="4qGA5WE49BU" role="3cqZAp">
-                                    <node concept="3cpWsn" id="4qGA5WE49BV" role="3cpWs9">
-                                      <property role="TrG5h" value="kind" />
-                                      <node concept="3uibUv" id="4qGA5WE49BW" role="1tU5fm">
-                                        <ref role="3uigEE" to="et5u:~MessageKind" resolve="MessageKind" />
+                              <node concept="3y3z36" id="6cGbuqOoSvR" role="3clFbw">
+                                <node concept="10Nm6u" id="6cGbuqOoTKs" role="3uHU7w" />
+                                <node concept="2OqwBi" id="6cGbuqOds2J" role="3uHU7B">
+                                  <node concept="37vLTw" id="6cGbuqOdrty" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                  </node>
+                                  <node concept="liA8E" id="6cGbuqOdvzy" role="2OqNvi">
+                                    <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbH" id="4qGA5WDXyjA" role="3cqZAp" />
+                            <node concept="3SKdUt" id="4qGA5WDXAIx" role="3cqZAp">
+                              <node concept="1PaTwC" id="4qGA5WDXAIy" role="1aUNEU">
+                                <node concept="3oM_SD" id="4qGA5WDXAJ6" role="1PaTwD">
+                                  <property role="3oM_SC" value="balloon" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1QHqEQ" id="7WKNeR8SQyM" role="3cqZAp">
+                              <node concept="1QHqEC" id="7WKNeR8SQyN" role="1QHqEI">
+                                <node concept="3clFbS" id="7WKNeR8SQyO" role="1bW5cS">
+                                  <node concept="3cpWs8" id="3MwxBzG5WQO" role="3cqZAp">
+                                    <node concept="3cpWsn" id="3MwxBzG5WQP" role="3cpWs9">
+                                      <property role="TrG5h" value="type" />
+                                      <node concept="3uibUv" id="3MwxBzG5WKh" role="1tU5fm">
+                                        <ref role="3uigEE" to="jkm4:~MessageType" resolve="MessageType" />
                                       </node>
-                                      <node concept="3K4zz7" id="6gnqipLtKIH" role="33vP2m">
-                                        <node concept="Rm8GO" id="6cGbuqOdzx8" role="3K4E3e">
-                                          <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
-                                          <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                                      <node concept="3K4zz7" id="3MwxBzG5XUq" role="33vP2m">
+                                        <node concept="1eOMI4" id="3MwxBzG5Y8h" role="3K4E3e">
+                                          <node concept="3K4zz7" id="3MwxBzG5Z0d" role="1eOMHV">
+                                            <node concept="2OqwBi" id="3MwxBzG5YpR" role="3K4Cdx">
+                                              <node concept="37vLTw" id="3MwxBzG5Ydb" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
+                                              </node>
+                                              <node concept="liA8E" id="3MwxBzG5YFa" role="2OqNvi">
+                                                <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
+                                              </node>
+                                            </node>
+                                            <node concept="10M0yZ" id="3MwxBzG5Zes" role="3K4E3e">
+                                              <ref role="3cqZAo" to="jkm4:~MessageType.WARNING" resolve="WARNING" />
+                                              <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
+                                            </node>
+                                            <node concept="10M0yZ" id="3MwxBzG5WQQ" role="3K4GZi">
+                                              <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
+                                              <ref role="3cqZAo" to="jkm4:~MessageType.INFO" resolve="INFO" />
+                                            </node>
+                                          </node>
                                         </node>
-                                        <node concept="Rm8GO" id="6cGbuqOd$Q2" role="3K4GZi">
-                                          <ref role="Rm8GQ" to="et5u:~MessageKind.ERROR" resolve="ERROR" />
-                                          <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
-                                        </node>
-                                        <node concept="2OqwBi" id="4qGA5WDVGuH" role="3K4Cdx">
-                                          <node concept="37vLTw" id="4qGA5WDVFXY" role="2Oq$k0">
+                                        <node concept="2OqwBi" id="3MwxBzG5Xhs" role="3K4Cdx">
+                                          <node concept="37vLTw" id="3MwxBzG5X50" role="2Oq$k0">
                                             <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
                                           </node>
-                                          <node concept="liA8E" id="6cGbuqOdylK" role="2OqNvi">
+                                          <node concept="liA8E" id="3MwxBzG5Xyj" role="2OqNvi">
                                             <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
                                           </node>
                                         </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3cpWs8" id="4qGA5WE49BX" role="3cqZAp">
-                                    <node concept="3cpWsn" id="4qGA5WE49BY" role="3cpWs9">
-                                      <property role="TrG5h" value="cause" />
-                                      <node concept="3uibUv" id="4qGA5WE49BZ" role="1tU5fm">
-                                        <ref role="3uigEE" to="wyt6:~Throwable" resolve="Throwable" />
-                                      </node>
-                                      <node concept="2OqwBi" id="6cGbuqOoY1R" role="33vP2m">
-                                        <node concept="37vLTw" id="6cGbuqOoWFI" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                        </node>
-                                        <node concept="liA8E" id="6cGbuqOoZ0e" role="2OqNvi">
-                                          <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
+                                        <node concept="10M0yZ" id="3MwxBzG5ZpH" role="3K4GZi">
+                                          <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
+                                          <ref role="3cqZAo" to="jkm4:~MessageType.ERROR" resolve="ERROR" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3cpWs8" id="4qGA5WE49C8" role="3cqZAp">
-                                    <node concept="3cpWsn" id="4qGA5WE49C9" role="3cpWs9">
-                                      <property role="TrG5h" value="msg" />
-                                      <node concept="3uibUv" id="4qGA5WE49Ca" role="1tU5fm">
-                                        <ref role="3uigEE" to="et5u:~Message" resolve="Message" />
-                                      </node>
-                                      <node concept="2ShNRf" id="4qGA5WE49Cb" role="33vP2m">
-                                        <node concept="1pGfFk" id="4qGA5WE49Cc" role="2ShVmc">
-                                          <ref role="37wK5l" to="et5u:~Message.&lt;init&gt;(jetbrains.mps.messages.MessageKind,java.lang.String)" resolve="Message" />
-                                          <node concept="37vLTw" id="4qGA5WE49Cd" role="37wK5m">
-                                            <ref role="3cqZAo" node="4qGA5WE49BV" resolve="kind" />
-                                          </node>
-                                          <node concept="2OqwBi" id="4qGA5WE49Ce" role="37wK5m">
-                                            <node concept="37vLTw" id="4qGA5WE49Cf" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                            </node>
-                                            <node concept="liA8E" id="4qGA5WE49Cg" role="2OqNvi">
-                                              <ref role="37wK5l" to="psoy:7Oc59RSJr0t" resolve="toString" />
-                                            </node>
-                                          </node>
+                                  <node concept="3clFbF" id="7WKNeR8SQyP" role="3cqZAp">
+                                    <node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
+                                      <node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
+                                        <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
+                                        <node concept="37vLTw" id="7WKNeR8SQyS" role="37wK5m">
+                                          <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbF" id="4qGA5WE49Ch" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4qGA5WE49Ci" role="3clFbG">
-                                      <node concept="37vLTw" id="4qGA5WE49Cj" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
-                                      </node>
-                                      <node concept="liA8E" id="4qGA5WE49Ck" role="2OqNvi">
-                                        <ref role="37wK5l" to="et5u:~Message.setException(java.lang.Throwable)" resolve="setException" />
-                                        <node concept="37vLTw" id="4qGA5WE49Cl" role="37wK5m">
-                                          <ref role="3cqZAo" node="4qGA5WE49BY" resolve="cause" />
+                                      <node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
+                                        <node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
+                                          <property role="Xl_RC" value="Messages" />
+                                        </node>
+                                        <node concept="37vLTw" id="3MwxBzG62ZC" role="37wK5m">
+                                          <ref role="3cqZAo" node="3MwxBzG5WQP" resolve="type" />
+                                        </node>
+                                        <node concept="37vLTw" id="3MwxBzG62uZ" role="37wK5m">
+                                          <ref role="3cqZAo" node="3MwxBzG61n8" resolve="message" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="4qGA5WDVyB7" role="3cqZAp">
-                                    <node concept="2OqwBi" id="4qGA5WDVz9r" role="3clFbG">
-                                      <node concept="2YIFZM" id="4qGA5WDXXjg" role="2Oq$k0">
-                                        <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
-                                        <ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
-                                        <node concept="37vLTw" id="4qGA5WDY0gH" role="37wK5m">
-                                          <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
-                                        </node>
-                                      </node>
-                                      <node concept="liA8E" id="4qGA5WDVzx0" role="2OqNvi">
-                                        <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
-                                        <node concept="37vLTw" id="4qGA5WDW9OW" role="37wK5m">
-                                          <ref role="3cqZAo" node="4qGA5WE49C9" resolve="msg" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3clFbF" id="6cGbuqOmSB7" role="3cqZAp">
-                                    <node concept="2OqwBi" id="6cGbuqOmTJT" role="3clFbG">
-                                      <node concept="37vLTw" id="6cGbuqOmSB5" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                      </node>
-                                      <node concept="liA8E" id="6cGbuqOmV81" role="2OqNvi">
-                                        <ref role="37wK5l" to="psoy:6cGbuqOk51p" resolve="clearCause" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3y3z36" id="6cGbuqOoSvR" role="3clFbw">
-                                  <node concept="10Nm6u" id="6cGbuqOoTKs" role="3uHU7w" />
-                                  <node concept="2OqwBi" id="6cGbuqOds2J" role="3uHU7B">
-                                    <node concept="37vLTw" id="6cGbuqOdrty" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                    </node>
-                                    <node concept="liA8E" id="6cGbuqOdvzy" role="2OqNvi">
-                                      <ref role="37wK5l" to="psoy:5X1yxJI3vjy" resolve="cause" />
-                                    </node>
-                                  </node>
                                 </node>
                               </node>
-                              <node concept="3clFbH" id="4qGA5WDXyjA" role="3cqZAp" />
-                              <node concept="3SKdUt" id="4qGA5WDXAIx" role="3cqZAp">
-                                <node concept="1PaTwC" id="4qGA5WDXAIy" role="1aUNEU">
-                                  <node concept="3oM_SD" id="4qGA5WDXAJ6" role="1PaTwD">
-                                    <property role="3oM_SC" value="balloon" />
-                                  </node>
+                              <node concept="2OqwBi" id="7WKNeR8SQyX" role="ukAjM">
+                                <node concept="37vLTw" id="7WKNeR8SQyY" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
-                              </node>
-                              <node concept="1QHqEQ" id="7WKNeR8SQyM" role="3cqZAp">
-                                <node concept="1QHqEC" id="7WKNeR8SQyN" role="1QHqEI">
-                                  <node concept="3clFbS" id="7WKNeR8SQyO" role="1bW5cS">
-                                    <node concept="3cpWs8" id="3MwxBzG5WQO" role="3cqZAp">
-                                      <node concept="3cpWsn" id="3MwxBzG5WQP" role="3cpWs9">
-                                        <property role="TrG5h" value="type" />
-                                        <node concept="3uibUv" id="3MwxBzG5WKh" role="1tU5fm">
-                                          <ref role="3uigEE" to="jkm4:~MessageType" resolve="MessageType" />
-                                        </node>
-                                        <node concept="3K4zz7" id="3MwxBzG5XUq" role="33vP2m">
-                                          <node concept="1eOMI4" id="3MwxBzG5Y8h" role="3K4E3e">
-                                            <node concept="3K4zz7" id="3MwxBzG5Z0d" role="1eOMHV">
-                                              <node concept="2OqwBi" id="3MwxBzG5YpR" role="3K4Cdx">
-                                                <node concept="37vLTw" id="3MwxBzG5Ydb" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                                </node>
-                                                <node concept="liA8E" id="3MwxBzG5YFa" role="2OqNvi">
-                                                  <ref role="37wK5l" to="psoy:2gw7OvgCNSM" resolve="hasErrors" />
-                                                </node>
-                                              </node>
-                                              <node concept="10M0yZ" id="3MwxBzG5Zes" role="3K4E3e">
-                                                <ref role="3cqZAo" to="jkm4:~MessageType.WARNING" resolve="WARNING" />
-                                                <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
-                                              </node>
-                                              <node concept="10M0yZ" id="3MwxBzG5WQQ" role="3K4GZi">
-                                                <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
-                                                <ref role="3cqZAo" to="jkm4:~MessageType.INFO" resolve="INFO" />
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="2OqwBi" id="3MwxBzG5Xhs" role="3K4Cdx">
-                                            <node concept="37vLTw" id="3MwxBzG5X50" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3MwxBzG61na" resolve="result" />
-                                            </node>
-                                            <node concept="liA8E" id="3MwxBzG5Xyj" role="2OqNvi">
-                                              <ref role="37wK5l" to="psoy:7Oc59RS_hsj" resolve="isSuccessful" />
-                                            </node>
-                                          </node>
-                                          <node concept="10M0yZ" id="3MwxBzG5ZpH" role="3K4GZi">
-                                            <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
-                                            <ref role="3cqZAo" to="jkm4:~MessageType.ERROR" resolve="ERROR" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbF" id="7WKNeR8SQyP" role="3cqZAp">
-                                      <node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
-                                        <node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
-                                          <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                          <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
-                                          <node concept="37vLTw" id="7WKNeR8SQyS" role="37wK5m">
-                                            <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
-                                          </node>
-                                        </node>
-                                        <node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
-                                          <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
-                                          <node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
-                                            <property role="Xl_RC" value="Messages" />
-                                          </node>
-                                          <node concept="37vLTw" id="3MwxBzG62ZC" role="37wK5m">
-                                            <ref role="3cqZAo" node="3MwxBzG5WQP" resolve="type" />
-                                          </node>
-                                          <node concept="37vLTw" id="3MwxBzG62uZ" role="37wK5m">
-                                            <ref role="3cqZAo" node="3MwxBzG61n8" resolve="message" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2OqwBi" id="7WKNeR8SQyX" role="ukAjM">
-                                  <node concept="37vLTw" id="7WKNeR8SQyY" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
-                                  </node>
-                                  <node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
-                                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
-                                  </node>
+                                <node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="2AHcQZ" id="3MwxBzG61nh" role="2AJF6D">
-                              <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="3MwxBzG61nh" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="7WKNeR8Tofu" role="37wK5m">
-                      <node concept="37vLTw" id="7WKNeR8Tofv" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
-                      </node>
-                      <node concept="3_kTaI" id="7WKNeR8Tofw" role="2OqNvi" />
-                    </node>
                   </node>
-                </node>
-                <node concept="liA8E" id="AjlLkeine$" role="2OqNvi">
-                  <ref role="37wK5l" to="1yqb:MFuM6R00U6" resolve="withConfig" />
-                  <node concept="2YIFZM" id="AjlLkeiyYP" role="37wK5m">
-                    <ref role="37wK5l" to="tj24:2MNGcFT4ZOn" resolve="getEffectiveConfig" />
-                    <ref role="1Pybhc" to="tj24:7iCybvTy_Mb" resolve="TypecheckingOptions" />
+                  <node concept="2OqwBi" id="7WKNeR8Tofu" role="37wK5m">
+                    <node concept="37vLTw" id="7WKNeR8Tofv" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7WKNeR8TcXs" resolve="steps" />
+                    </node>
+                    <node concept="3_kTaI" id="7WKNeR8Tofw" role="2OqNvi" />
                   </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 de28ffcd..013b2104 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
@@ -5664,26 +5664,6 @@
                       </node>
                     </node>
                   </node>
-                  <node concept="3cpWs8" id="51ek2rQxWI4" role="3cqZAp">
-                    <node concept="3cpWsn" id="51ek2rQxWI5" role="3cpWs9">
-                      <property role="TrG5h" value="config" />
-                      <node concept="3uibUv" id="51ek2rQxWI6" role="1tU5fm">
-                        <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-                      </node>
-                      <node concept="2OqwBi" id="51ek2rQxWI7" role="33vP2m">
-                        <node concept="37vLTw" id="51ek2rQxWI8" role="2Oq$k0">
-                          <ref role="3cqZAo" node="51ek2rQxWIP" resolve="inEff" />
-                        </node>
-                        <node concept="liA8E" id="51ek2rQxWI9" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                          <node concept="10M0yZ" id="51ek2rQxWIa" role="37wK5m">
-                            <ref role="3cqZAo" to="1yqb:2j1FRbwXq5L" resolve="CONFIG" />
-                            <ref role="1PxDUh" to="1yqb:1pPth$lAzAx" resolve="Step" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbJ" id="51ek2rQxWIb" role="3cqZAp">
                     <node concept="3clFbS" id="51ek2rQxWIc" role="3clFbx">
                       <node concept="3cpWs8" id="51ek2rQxWHE" role="3cqZAp">
@@ -5898,25 +5878,14 @@
                       </node>
                       <node concept="3clFbH" id="51ek2rQPKju" role="3cqZAp" />
                     </node>
-                    <node concept="1Wc70l" id="51ek2rQxWI$" role="3clFbw">
-                      <node concept="3clFbC" id="1T5MAgPtxq7" role="3uHU7w">
-                        <node concept="10M0yZ" id="1T5MAgPt$0k" role="3uHU7B">
-                          <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
-                          <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
-                        </node>
-                        <node concept="2YIFZM" id="MSLbfMEkO5" role="3uHU7w">
-                          <ref role="37wK5l" node="MSLbfMCW$v" resolve="isTracing" />
-                          <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                          <node concept="37vLTw" id="MSLbfMEnJT" role="37wK5m">
-                            <ref role="3cqZAo" node="51ek2rQxWI5" resolve="config" />
-                          </node>
-                        </node>
+                    <node concept="3clFbC" id="1T5MAgPtxq7" role="3clFbw">
+                      <node concept="10M0yZ" id="1T5MAgPt$0k" role="3uHU7B">
+                        <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
+                        <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                       </node>
-                      <node concept="3y3z36" id="51ek2rQxWID" role="3uHU7B">
-                        <node concept="37vLTw" id="51ek2rQxWIE" role="3uHU7B">
-                          <ref role="3cqZAo" node="51ek2rQxWI5" resolve="config" />
-                        </node>
-                        <node concept="10Nm6u" id="51ek2rQxWIF" role="3uHU7w" />
+                      <node concept="2YIFZM" id="MSLbfMEkO5" role="3uHU7w">
+                        <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
+                        <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
                       </node>
                     </node>
                     <node concept="9aQIb" id="51ek2rQPGUO" role="9aQIa">
@@ -15171,12 +15140,6 @@
           <node concept="3qTvmN" id="1z4$59iB0$B" role="11_B2D" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqrBDu" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqrCy0" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqrDvF" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqrE0s" role="1tU5fm">
@@ -15252,19 +15215,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="1C_jAsqrKNC" role="3cqZAp">
-          <node concept="37vLTI" id="1C_jAsqrKNE" role="3clFbG">
-            <node concept="2OqwBi" id="1C_jAsqrOcr" role="37vLTJ">
-              <node concept="Xjq3P" id="1C_jAsqrOk2" role="2Oq$k0" />
-              <node concept="2OwXpG" id="1C_jAsqrOcu" role="2OqNvi">
-                <ref role="2Oxat5" node="1C_jAsqrKN$" resolve="config" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="1C_jAsqrKNI" role="37vLTx">
-              <ref role="3cqZAo" node="1C_jAsqrBDu" resolve="config" />
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6nFpYluG_0t" role="jymVt" />
@@ -15585,11 +15535,8 @@
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
             <node concept="2YIFZM" id="6wlInUZxUOs" role="33vP2m">
-              <ref role="37wK5l" node="MSLbfMFJZ2" resolve="isReporting" />
+              <ref role="37wK5l" node="1rU1wt_Qupt" resolve="isReporting" />
               <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="6wlInUZxUOt" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqrKN$" resolve="config" />
-              </node>
             </node>
           </node>
         </node>
@@ -15600,11 +15547,8 @@
               <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
             </node>
             <node concept="2YIFZM" id="MSLbfME8Mm" role="33vP2m">
-              <ref role="37wK5l" node="MSLbfMCW$v" resolve="isTracing" />
+              <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
               <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-              <node concept="37vLTw" id="MSLbfMEbqy" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqrKN$" resolve="config" />
-              </node>
             </node>
           </node>
         </node>
@@ -16321,14 +16265,6 @@
         <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
       </node>
     </node>
-    <node concept="312cEg" id="1C_jAsqrKN$" role="jymVt">
-      <property role="TrG5h" value="config" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="1C_jAsqrKN_" role="1B3o_S" />
-      <node concept="3uibUv" id="1C_jAsqrKNB" role="1tU5fm">
-        <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-      </node>
-    </node>
   </node>
   <node concept="3HP615" id="4Dkptq1Qcxp">
     <property role="TrG5h" value="CacheUpdatable" />
@@ -16453,25 +16389,6 @@
               </node>
               <node concept="1bVj0M" id="1T5MAgPu8cW" role="37wK5m">
                 <node concept="3clFbS" id="1T5MAgPu8cX" role="1bW5cS">
-                  <node concept="3cpWs8" id="799SgOKblO6" role="3cqZAp">
-                    <node concept="3cpWsn" id="799SgOKblO7" role="3cpWs9">
-                      <property role="TrG5h" value="config" />
-                      <node concept="3uibUv" id="799SgOKblO8" role="1tU5fm">
-                        <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-                      </node>
-                      <node concept="2OqwBi" id="799SgOKblO9" role="33vP2m">
-                        <node concept="37vLTw" id="799SgOKblOa" role="2Oq$k0">
-                          <ref role="3cqZAo" node="1T5MAgPu8d3" resolve="inEff" />
-                        </node>
-                        <node concept="liA8E" id="799SgOKblOb" role="2OqNvi">
-                          <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                          <node concept="37vLTw" id="1T5MAgPudzm" role="37wK5m">
-                            <ref role="3cqZAo" to="1yqb:2j1FRbwXq5L" resolve="CONFIG" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                   <node concept="3clFbH" id="799SgOKblOd" role="3cqZAp" />
                   <node concept="3cpWs8" id="799SgOKblO2" role="3cqZAp">
                     <node concept="3cpWsn" id="799SgOKblO3" role="3cpWs9">
@@ -16504,25 +16421,14 @@
                       <node concept="37vLTw" id="1T5MAgPvcxI" role="3uHU7w">
                         <ref role="3cqZAo" node="799SgOKgJ2W" resolve="traceTemplates" />
                       </node>
-                      <node concept="1Wc70l" id="799SgOKblPt" role="3uHU7B">
-                        <node concept="3y3z36" id="799SgOKblPu" role="3uHU7B">
-                          <node concept="37vLTw" id="799SgOKblPv" role="3uHU7B">
-                            <ref role="3cqZAo" node="799SgOKblO7" resolve="config" />
-                          </node>
-                          <node concept="10Nm6u" id="799SgOKblPw" role="3uHU7w" />
+                      <node concept="3clFbC" id="1T5MAgPtjla" role="3uHU7B">
+                        <node concept="10M0yZ" id="1T5MAgPtkrW" role="3uHU7B">
+                          <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
+                          <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
                         </node>
-                        <node concept="3clFbC" id="1T5MAgPtjla" role="3uHU7w">
-                          <node concept="10M0yZ" id="1T5MAgPtkrW" role="3uHU7B">
-                            <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
-                            <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
-                          </node>
-                          <node concept="2YIFZM" id="MSLbfMEhDp" role="3uHU7w">
-                            <ref role="37wK5l" node="MSLbfMCW$v" resolve="isTracing" />
-                            <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                            <node concept="37vLTw" id="MSLbfMHk38" role="37wK5m">
-                              <ref role="3cqZAo" node="799SgOKblO7" resolve="config" />
-                            </node>
-                          </node>
+                        <node concept="2YIFZM" id="MSLbfMEhDp" role="3uHU7w">
+                          <ref role="37wK5l" node="1rU1wt_QrBg" resolve="isTracing" />
+                          <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
                         </node>
                       </node>
                     </node>
@@ -16673,49 +16579,10 @@
       </node>
       <node concept="3Tm1VV" id="1z4$59iPqgS" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="6v6oK28840J" role="jymVt" />
-    <node concept="3clFb_" id="6v6oK28diKq" role="jymVt">
-      <property role="TrG5h" value="evaluate" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="3uibUv" id="6v6oK28duPX" role="3clF45">
-        <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
-        <node concept="16syzq" id="6v6oK28dxY_" role="11_B2D">
-          <ref role="16sUi3" node="1z4$59iqk5$" resolve="T" />
-        </node>
-      </node>
-      <node concept="3Tmbuc" id="6v6oK28dtH3" role="1B3o_S" />
-      <node concept="3clFbS" id="6v6oK28diKu" role="3clF47" />
-      <node concept="37vLTG" id="1C_jAsqhPeE" role="3clF46">
-        <property role="TrG5h" value="state" />
-        <node concept="3uibUv" id="1C_jAsqp072" role="1tU5fm">
-          <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1C_jAsqp073" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp074" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1C_jAsqp075" role="3clF46">
-        <property role="TrG5h" value="messageHandler" />
-        <node concept="3uibUv" id="1C_jAsqp076" role="1tU5fm">
-          <ref role="3uigEE" to="et5u:~IMessageHandler" resolve="IMessageHandler" />
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="_imFI7Rgbm" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" />
-        <node concept="2B6LJw" id="_imFI7Rltd" role="2B76xF">
-          <ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
-          <node concept="3clFbT" id="_imFI7RlON" role="2B70Vg">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="_imFI7Rn8k" role="jymVt" />
     <node concept="3clFb_" id="_imFI7RlPa" role="jymVt">
       <property role="TrG5h" value="evaluate" />
+      <property role="1EzhhJ" value="true" />
       <node concept="3uibUv" id="_imFI7RlPb" role="3clF45">
         <ref role="3uigEE" node="1RYTbd8bNK8" resolve="Response" />
         <node concept="16syzq" id="_imFI7RlPc" role="11_B2D">
@@ -16723,23 +16590,7 @@
         </node>
       </node>
       <node concept="3Tmbuc" id="_imFI7RlPd" role="1B3o_S" />
-      <node concept="3clFbS" id="_imFI7RlPe" role="3clF47">
-        <node concept="3clFbF" id="_imFI7RqmM" role="3cqZAp">
-          <node concept="1rXfSq" id="_imFI7RqmL" role="3clFbG">
-            <ref role="37wK5l" node="6v6oK28diKq" resolve="evaluate" />
-            <node concept="37vLTw" id="_imFI7Rtd7" role="37wK5m">
-              <ref role="3cqZAo" node="_imFI7RlPf" resolve="state" />
-            </node>
-            <node concept="2YIFZM" id="_imFI7Rvzx" role="37wK5m">
-              <ref role="37wK5l" node="2MNGcFT4ZOn" resolve="getEffectiveConfig" />
-              <ref role="1Pybhc" node="7iCybvTy_Mb" resolve="TypecheckingOptions" />
-            </node>
-            <node concept="37vLTw" id="_imFI7RxxV" role="37wK5m">
-              <ref role="3cqZAo" node="_imFI7RlPj" resolve="messageHandler" />
-            </node>
-          </node>
-        </node>
-      </node>
+      <node concept="3clFbS" id="_imFI7RlPe" role="3clF47" />
       <node concept="37vLTG" id="_imFI7RlPf" role="3clF46">
         <property role="TrG5h" value="state" />
         <node concept="3uibUv" id="_imFI7RlPg" role="1tU5fm">
@@ -17095,25 +16946,17 @@
                   <ref role="3cqZAo" node="6v6oK26xzgi" resolve="result" />
                 </node>
                 <node concept="TSZUe" id="6v6oK26xzhg" role="2OqNvi">
-                  <node concept="2OqwBi" id="6v6oK26xzhh" role="25WWJ7">
-                    <node concept="2ShNRf" id="6v6oK26xzhi" role="2Oq$k0">
-                      <node concept="1pGfFk" id="6v6oK26xzhj" role="2ShVmc">
-                        <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
-                        <node concept="37vLTw" id="6v6oK26xzhk" role="37wK5m">
-                          <ref role="3cqZAo" node="6v6oK26xzhq" resolve="aspectClique" />
-                        </node>
-                        <node concept="2OqwBi" id="6v6oK26xzhl" role="37wK5m">
-                          <node concept="37vLTw" id="6v6oK26xzhm" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6v6oK26xzgz" resolve="steps" />
-                          </node>
-                          <node concept="3_kTaI" id="6v6oK26xzhn" role="2OqNvi" />
-                        </node>
+                  <node concept="2ShNRf" id="6v6oK26xzhi" role="25WWJ7">
+                    <node concept="1pGfFk" id="6v6oK26xzhj" role="2ShVmc">
+                      <ref role="37wK5l" to="1yqb:443LGHBiDEV" resolve="CoderulesHelper" />
+                      <node concept="37vLTw" id="6v6oK26xzhk" role="37wK5m">
+                        <ref role="3cqZAo" node="6v6oK26xzhq" resolve="aspectClique" />
                       </node>
-                    </node>
-                    <node concept="liA8E" id="6v6oK26xzho" role="2OqNvi">
-                      <ref role="37wK5l" to="1yqb:MFuM6R00U6" resolve="withConfig" />
-                      <node concept="37vLTw" id="1C_jAsqvRKH" role="37wK5m">
-                        <ref role="3cqZAo" node="1C_jAsqvI64" resolve="config" />
+                      <node concept="2OqwBi" id="6v6oK26xzhl" role="37wK5m">
+                        <node concept="37vLTw" id="6v6oK26xzhm" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6v6oK26xzgz" resolve="steps" />
+                        </node>
+                        <node concept="3_kTaI" id="6v6oK26xzhn" role="2OqNvi" />
                       </node>
                     </node>
                   </node>
@@ -17168,12 +17011,6 @@
           <ref role="3uigEE" node="7i3KM7gIg9K" resolve="TypecheckingStrategy.Default" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqvI64" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqvK_Z" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="6v6oK26xpn9" role="jymVt" />
     <node concept="312cEg" id="1z4$59iurfU" role="jymVt">
@@ -17705,9 +17542,6 @@
                               <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
                             </node>
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqvvjm" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06T" resolve="config" />
-                          </node>
                           <node concept="37vLTw" id="1C_jAsqril_" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqp06V" resolve="messageHandler" />
                           </node>
@@ -17882,12 +17716,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06T" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06U" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06V" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06W" role="1tU5fm">
@@ -18138,9 +17966,6 @@
                               <ref role="37wK5l" node="1C_jAsql6Ib" resolve="getRepository" />
                             </node>
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqvrAQ" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06Y" resolve="config" />
-                          </node>
                           <node concept="37vLTw" id="1C_jAsqrkH5" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqp070" resolve="messageHandler" />
                           </node>
@@ -18358,12 +18183,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06Y" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06Z" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp070" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp071" role="1tU5fm">
@@ -18638,9 +18457,6 @@
                           <node concept="37vLTw" id="1C_jAsqsLnj" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqsLmO" resolve="strategy" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqw4s4" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06r" resolve="config" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -18654,9 +18470,6 @@
                             <node concept="1pGfFk" id="1C_jAsqsLnY" role="2ShVmc">
                               <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                               <node concept="Xjq3P" id="1C_jAsqsLnZ" role="37wK5m" />
-                              <node concept="37vLTw" id="1C_jAsqsW0_" role="37wK5m">
-                                <ref role="3cqZAo" node="1C_jAsqp06r" resolve="config" />
-                              </node>
                               <node concept="37vLTw" id="1C_jAsqsLo1" role="37wK5m">
                                 <ref role="3cqZAo" node="1C_jAsqp06t" resolve="messageHandler" />
                               </node>
@@ -18793,12 +18606,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06r" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06s" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06t" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06u" role="1tU5fm">
@@ -19004,9 +18811,6 @@
                           <node concept="37vLTw" id="1C_jAsqtbhT" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqtbh_" resolve="strategy" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqvQ0x" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06w" resolve="config" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -19033,9 +18837,6 @@
                                     <node concept="1pGfFk" id="1C_jAsqtbiC" role="2ShVmc">
                                       <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                                       <node concept="Xjq3P" id="1C_jAsqtbiD" role="37wK5m" />
-                                      <node concept="37vLTw" id="1C_jAsqtnEp" role="37wK5m">
-                                        <ref role="3cqZAo" node="1C_jAsqp06w" resolve="config" />
-                                      </node>
                                       <node concept="37vLTw" id="1C_jAsqtbiF" role="37wK5m">
                                         <ref role="3cqZAo" node="1C_jAsqp06y" resolve="messageHandler" />
                                       </node>
@@ -19219,12 +19020,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06w" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06x" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06y" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06z" role="1tU5fm">
@@ -19523,9 +19318,6 @@
                           <node concept="37vLTw" id="1C_jAsqutDg" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqutCW" resolve="strategy" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqvVNA" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06_" resolve="config" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -19552,9 +19344,6 @@
                                     <node concept="1pGfFk" id="1C_jAsqutDZ" role="2ShVmc">
                                       <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                                       <node concept="Xjq3P" id="1C_jAsqutE0" role="37wK5m" />
-                                      <node concept="37vLTw" id="1C_jAsquQ9I" role="37wK5m">
-                                        <ref role="3cqZAo" node="1C_jAsqp06_" resolve="config" />
-                                      </node>
                                       <node concept="37vLTw" id="1C_jAsqutE2" role="37wK5m">
                                         <ref role="3cqZAo" node="1C_jAsqp06B" resolve="messageHandler" />
                                       </node>
@@ -19737,12 +19526,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06_" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06A" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06B" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06C" role="1tU5fm">
@@ -20038,9 +19821,6 @@
                           <node concept="37vLTw" id="1C_jAsqtIH_" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsqtIHh" resolve="strategy" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqvYwc" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06E" resolve="config" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -20054,9 +19834,6 @@
                             <node concept="1pGfFk" id="1C_jAsqtIIg" role="2ShVmc">
                               <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                               <node concept="Xjq3P" id="1C_jAsqtIIh" role="37wK5m" />
-                              <node concept="37vLTw" id="1C_jAsqtQJw" role="37wK5m">
-                                <ref role="3cqZAo" node="1C_jAsqp06E" resolve="config" />
-                              </node>
                               <node concept="37vLTw" id="1C_jAsqtIIj" role="37wK5m">
                                 <ref role="3cqZAo" node="1C_jAsqp06G" resolve="messageHandler" />
                               </node>
@@ -20201,12 +19978,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06E" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06F" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06G" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06H" role="1tU5fm">
@@ -20338,9 +20109,6 @@
               <node concept="37vLTw" id="1C_jAsquhgI" role="37wK5m">
                 <ref role="3cqZAo" node="1C_jAsquhgu" resolve="strategy" />
               </node>
-              <node concept="37vLTw" id="1C_jAsqw2tx" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqp06J" resolve="config" />
-              </node>
             </node>
           </node>
         </node>
@@ -20354,9 +20122,6 @@
                 <node concept="1pGfFk" id="1C_jAsquhhp" role="2ShVmc">
                   <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                   <node concept="Xjq3P" id="1C_jAsquhhq" role="37wK5m" />
-                  <node concept="37vLTw" id="1C_jAsquljV" role="37wK5m">
-                    <ref role="3cqZAo" node="1C_jAsqp06J" resolve="config" />
-                  </node>
                   <node concept="37vLTw" id="1C_jAsquhhs" role="37wK5m">
                     <ref role="3cqZAo" node="1C_jAsqp06L" resolve="messageHandler" />
                   </node>
@@ -20426,12 +20191,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06J" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06K" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06L" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06M" role="1tU5fm">
@@ -20597,9 +20356,6 @@
               <node concept="37vLTw" id="6v6oK27vjhU" role="37wK5m">
                 <ref role="3cqZAo" node="6v6oK27vjgM" resolve="strategy" />
               </node>
-              <node concept="37vLTw" id="1C_jAsqw6Fm" role="37wK5m">
-                <ref role="3cqZAo" node="1C_jAsqvmX5" resolve="config" />
-              </node>
             </node>
           </node>
         </node>
@@ -20613,9 +20369,6 @@
                 <node concept="1pGfFk" id="6v6oK28cLVz" role="2ShVmc">
                   <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                   <node concept="Xjq3P" id="6v6oK28cLV$" role="37wK5m" />
-                  <node concept="37vLTw" id="1C_jAsqvosI" role="37wK5m">
-                    <ref role="3cqZAo" node="1C_jAsqvmX5" resolve="config" />
-                  </node>
                   <node concept="37vLTw" id="1C_jAsqsc1T" role="37wK5m">
                     <ref role="3cqZAo" node="1C_jAsqpZQL" resolve="messageHandler" />
                   </node>
@@ -20662,12 +20415,6 @@
           <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqvmX5" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="628U2saJvdJ" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqpZQL" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="628U2saJvdK" role="1tU5fm">
@@ -20895,9 +20642,6 @@
                           <node concept="37vLTw" id="1C_jAsquY1$" role="37wK5m">
                             <ref role="3cqZAo" node="1C_jAsquY1f" resolve="strategy" />
                           </node>
-                          <node concept="37vLTw" id="1C_jAsqw0FN" role="37wK5m">
-                            <ref role="3cqZAo" node="1C_jAsqp06O" resolve="config" />
-                          </node>
                         </node>
                       </node>
                     </node>
@@ -20911,9 +20655,6 @@
                             <node concept="1pGfFk" id="1C_jAsquY2n" role="2ShVmc">
                               <ref role="37wK5l" node="6nFpYluGGhv" resolve="BlockingExecutor" />
                               <node concept="Xjq3P" id="1C_jAsquY2o" role="37wK5m" />
-                              <node concept="37vLTw" id="1C_jAsqv8RQ" role="37wK5m">
-                                <ref role="3cqZAo" node="1C_jAsqp06O" resolve="config" />
-                              </node>
                               <node concept="37vLTw" id="1C_jAsquY2q" role="37wK5m">
                                 <ref role="3cqZAo" node="1C_jAsqp06Q" resolve="messageHandler" />
                               </node>
@@ -21052,12 +20793,6 @@
           <ref role="3uigEE" node="4Z$O9mrQIzY" resolve="TypecheckingState" />
         </node>
       </node>
-      <node concept="37vLTG" id="1C_jAsqp06O" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="1C_jAsqp06P" role="1tU5fm">
-          <ref role="3uigEE" node="7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
       <node concept="37vLTG" id="1C_jAsqp06Q" role="3clF46">
         <property role="TrG5h" value="messageHandler" />
         <node concept="3uibUv" id="1C_jAsqp06R" role="1tU5fm">
@@ -21215,6 +20950,22 @@
       </node>
     </node>
     <node concept="2tJIrI" id="MSLbfMCRlJ" role="jymVt" />
+    <node concept="2YIFZL" id="1rU1wt_Qupt" role="jymVt">
+      <property role="TrG5h" value="isReporting" />
+      <node concept="10P_77" id="1rU1wt_Qupu" role="3clF45" />
+      <node concept="3Tm1VV" id="1rU1wt_Qupv" role="1B3o_S" />
+      <node concept="3clFbS" id="1rU1wt_Qupw" role="3clF47">
+        <node concept="3cpWs6" id="1rU1wt_Qupx" role="3cqZAp">
+          <node concept="1rXfSq" id="1rU1wt_Qupy" role="3cqZAk">
+            <ref role="37wK5l" node="MSLbfMFJZ2" resolve="isReporting" />
+            <node concept="1rXfSq" id="1rU1wt_Qupz" role="37wK5m">
+              <ref role="37wK5l" node="2MNGcFT4ZOn" resolve="getEffectiveConfig" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1rU1wt_Qups" role="jymVt" />
     <node concept="2YIFZL" id="MSLbfMFJZ2" role="jymVt">
       <property role="TrG5h" value="isReporting" />
       <node concept="37vLTG" id="MSLbfMFJZ3" role="3clF46">
@@ -21246,7 +20997,23 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="MSLbfMCYAT" role="jymVt" />
+    <node concept="2tJIrI" id="1rU1wt_QvuR" role="jymVt" />
+    <node concept="2YIFZL" id="12GJQPKvlN4" role="jymVt">
+      <property role="TrG5h" value="isTracing" />
+      <node concept="10P_77" id="12GJQPKvlN5" role="3clF45" />
+      <node concept="3Tm1VV" id="12GJQPKvlN6" role="1B3o_S" />
+      <node concept="3clFbS" id="12GJQPKvlN7" role="3clF47">
+        <node concept="3cpWs6" id="12GJQPKvlN8" role="3cqZAp">
+          <node concept="1rXfSq" id="12GJQPKvlN9" role="3cqZAk">
+            <ref role="37wK5l" node="MSLbfMCW$v" resolve="isTracing" />
+            <node concept="1rXfSq" id="12GJQPKvlNa" role="37wK5m">
+              <ref role="37wK5l" node="2MNGcFT4ZOn" resolve="getEffectiveConfig" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="12GJQPKvlN3" role="jymVt" />
     <node concept="2YIFZL" id="MSLbfMCW$v" role="jymVt">
       <property role="TrG5h" value="isTracing" />
       <node concept="37vLTG" id="MSLbfMCW$w" role="3clF46">
@@ -21287,6 +21054,22 @@
       </node>
     </node>
     <node concept="2tJIrI" id="MSLbfMEud0" role="jymVt" />
+    <node concept="2YIFZL" id="1rU1wt_QrBg" role="jymVt">
+      <property role="TrG5h" value="isProfiling" />
+      <node concept="10P_77" id="1rU1wt_QrBj" role="3clF45" />
+      <node concept="3Tm1VV" id="1rU1wt_QrBk" role="1B3o_S" />
+      <node concept="3clFbS" id="1rU1wt_QrBl" role="3clF47">
+        <node concept="3cpWs6" id="1rU1wt_Qu58" role="3cqZAp">
+          <node concept="1rXfSq" id="1rU1wt_Qu59" role="3cqZAk">
+            <ref role="37wK5l" node="MSLbfMCSQR" resolve="isProfiling" />
+            <node concept="1rXfSq" id="1rU1wt_Qu5a" role="37wK5m">
+              <ref role="37wK5l" node="2MNGcFT4ZOn" resolve="getEffectiveConfig" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="MSLbfMCYAT" role="jymVt" />
     <node concept="2YIFZL" id="MSLbfMCSQR" role="jymVt">
       <property role="TrG5h" value="isProfiling" />
       <node concept="37vLTG" id="MSLbfMCSQS" role="3clF46">
@@ -21319,6 +21102,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="MSLbfMFRc9" role="jymVt" />
+    <node concept="2tJIrI" id="12GJQPKvkbI" role="jymVt" />
     <node concept="Wx3nA" id="7e$2hwaBArb" role="jymVt">
       <property role="TrG5h" value="USER_CONFIG" />
       <node concept="3Tm6S6" id="7e$2hwaBArd" role="1B3o_S" />
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index 836552cd..abd3d701 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -1247,26 +1247,6 @@
     <property role="1sVAO0" value="true" />
     <property role="3GE5qa" value="launch.step" />
     <node concept="2tJIrI" id="2j1FRbwXpYp" role="jymVt" />
-    <node concept="Wx3nA" id="2j1FRbwXq5L" role="jymVt">
-      <property role="TrG5h" value="CONFIG" />
-      <node concept="3Tm1VV" id="2j1FRbwXq9J" role="1B3o_S" />
-      <node concept="3uibUv" id="2j1FRbwXqde" role="1tU5fm">
-        <ref role="3uigEE" node="2daneBOX7Tv" resolve="Effect.ValueKey" />
-        <node concept="3uibUv" id="4Wn$Hm2h_mT" role="11_B2D">
-          <ref role="3uigEE" to="tj24:7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="2YIFZM" id="2j1FRbwXrqI" role="33vP2m">
-        <ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
-        <ref role="37wK5l" node="2j1FRbwXsxX" resolve="valueKey" />
-        <node concept="Xl_RD" id="2j1FRbwXGwn" role="37wK5m">
-          <property role="Xl_RC" value="config" />
-        </node>
-        <node concept="3uibUv" id="4Wn$Hm2h_Sg" role="3PaCim">
-          <ref role="3uigEE" to="tj24:7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-    </node>
     <node concept="Wx3nA" id="23Habm2dyBS" role="jymVt">
       <property role="TrG5h" value="PROFILER" />
       <node concept="3Tm1VV" id="23Habm2dyBT" role="1B3o_S" />
@@ -4250,38 +4230,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="MFuM6R00Uk" role="jymVt" />
-    <node concept="3clFb_" id="MFuM6R00U6" role="jymVt">
-      <property role="TrG5h" value="withConfig" />
-      <node concept="37vLTG" id="MFuM6R00U7" role="3clF46">
-        <property role="TrG5h" value="config" />
-        <node concept="3uibUv" id="4Wn$Hm2hUiS" role="1tU5fm">
-          <ref role="3uigEE" to="tj24:7iCybvToiT5" resolve="Config" />
-        </node>
-      </node>
-      <node concept="3uibUv" id="MFuM6R00U9" role="3clF45">
-        <ref role="3uigEE" node="1pPth$l_TFV" resolve="CoderulesHelper" />
-      </node>
-      <node concept="3Tm1VV" id="MFuM6R00Ua" role="1B3o_S" />
-      <node concept="3clFbS" id="MFuM6R00Ub" role="3clF47">
-        <node concept="3clFbF" id="MFuM6R0sLE" role="3cqZAp">
-          <node concept="37vLTI" id="MFuM6R0tda" role="3clFbG">
-            <node concept="37vLTw" id="MFuM6R0uja" role="37vLTx">
-              <ref role="3cqZAo" node="MFuM6R00U7" resolve="config" />
-            </node>
-            <node concept="2OqwBi" id="MFuM6R0sWa" role="37vLTJ">
-              <node concept="Xjq3P" id="MFuM6R0sLC" role="2Oq$k0" />
-              <node concept="2OwXpG" id="MFuM6R0t29" role="2OqNvi">
-                <ref role="2Oxat5" node="MFuM6R0ncG" resolve="config" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="MFuM6R00Ui" role="3cqZAp">
-          <node concept="Xjq3P" id="MFuM6R00Uj" role="3clFbG" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6kREIVkVDd1" role="jymVt" />
     <node concept="3clFb_" id="1pPth$lNVW2" role="jymVt">
       <property role="TrG5h" value="executeAsync" />
       <node concept="3Tm1VV" id="1pPth$lNVW5" role="1B3o_S" />
@@ -4650,12 +4598,9 @@
               <ref role="3uigEE" to="bid0:~Profiler" resolve="Profiler" />
             </node>
             <node concept="3K4zz7" id="23Habm5FSDD" role="33vP2m">
-              <node concept="2YIFZM" id="MSLbfMG0Hl" role="3K4Cdx">
-                <ref role="37wK5l" to="tj24:MSLbfMCSQR" resolve="isProfiling" />
+              <node concept="2YIFZM" id="12GJQPKv0Dc" role="3K4Cdx">
+                <ref role="37wK5l" to="tj24:1rU1wt_QrBg" resolve="isProfiling" />
                 <ref role="1Pybhc" to="tj24:7iCybvTy_Mb" resolve="TypecheckingOptions" />
-                <node concept="37vLTw" id="MSLbfMG4$e" role="37wK5m">
-                  <ref role="3cqZAo" node="MFuM6R0ncG" resolve="config" />
-                </node>
               </node>
               <node concept="2ShNRf" id="23Habm5M18O" role="3K4E3e">
                 <node concept="1pGfFk" id="23Habm5Mgkv" role="2ShVmc">
@@ -4686,18 +4631,6 @@
                 <node concept="Xl_RD" id="2j1FRbwXmOL" role="37wK5m">
                   <property role="Xl_RC" value="init" />
                 </node>
-                <node concept="2OqwBi" id="2j1FRbwXC7B" role="37wK5m">
-                  <node concept="10M0yZ" id="2j1FRbwXB2x" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2j1FRbwXq5L" resolve="CONFIG" />
-                    <ref role="1PxDUh" node="1pPth$lAzAx" resolve="Step" />
-                  </node>
-                  <node concept="liA8E" id="2j1FRbwXD6g" role="2OqNvi">
-                    <ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
-                    <node concept="37vLTw" id="2j1FRbwXEAs" role="37wK5m">
-                      <ref role="3cqZAo" node="MFuM6R0ncG" resolve="config" />
-                    </node>
-                  </node>
-                </node>
                 <node concept="2OqwBi" id="23Habm2dPPc" role="37wK5m">
                   <node concept="10M0yZ" id="23Habm2dM4x" role="2Oq$k0">
                     <ref role="3cqZAo" node="23Habm2dyBS" resolve="PROFILER" />
@@ -5306,13 +5239,6 @@
         <ref role="3uigEE" node="3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
       </node>
     </node>
-    <node concept="312cEg" id="MFuM6R0ncG" role="jymVt">
-      <property role="TrG5h" value="config" />
-      <node concept="3Tm6S6" id="MFuM6R0ncH" role="1B3o_S" />
-      <node concept="3uibUv" id="4Wn$Hm2hROv" role="1tU5fm">
-        <ref role="3uigEE" to="tj24:7iCybvToiT5" resolve="Config" />
-      </node>
-    </node>
     <node concept="3Tm1VV" id="1pPth$l_TFW" role="1B3o_S" />
     <node concept="3UR2Jj" id="443LGHBnxs1" role="lGtFl">
       <node concept="TZ5HA" id="443LGHBnxs2" role="TZ5H$">