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 85cef2c4..3d8d7ab0 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
@@ -3387,6 +3387,88 @@
                                         </node>
                                       </node>
                                     </node>
+                                    <node concept="3clFbF" id="5lpFZvO4Wcm" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5lpFZvO4Xwg" role="3clFbG">
+                                        <node concept="37vLTw" id="5lpFZvO4Wck" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="51ek2rQxWIP" resolve="inEff" />
+                                        </node>
+                                        <node concept="liA8E" id="5lpFZvO4Zq7" role="2OqNvi">
+                                          <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="doWithValue" />
+                                          <node concept="10M0yZ" id="7Vnjo8LOnak" role="37wK5m">
+                                            <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
+                                            <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                          </node>
+                                          <node concept="1bVj0M" id="5lpFZvO55VX" role="37wK5m">
+                                            <node concept="gl6BB" id="5lpFZvO4NRX" role="1bW2Oz">
+                                              <property role="TrG5h" value="evalTrace" />
+                                              <node concept="2jxLKc" id="5lpFZvO4NRY" role="1tU5fm" />
+                                            </node>
+                                            <node concept="3clFbS" id="5lpFZvO55Wc" role="1bW5cS">
+                                              <node concept="3cpWs8" id="51ek2rQxWId" role="3cqZAp">
+                                                <node concept="3cpWsn" id="51ek2rQxWIe" role="3cpWs9">
+                                                  <property role="TrG5h" value="evtrace" />
+                                                  <node concept="3uibUv" id="51ek2rQxWIf" role="1tU5fm">
+                                                    <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                                                  </node>
+                                                  <node concept="1eOMI4" id="51ek2rQxWIg" role="33vP2m">
+                                                    <node concept="10QFUN" id="51ek2rQxWIh" role="1eOMHV">
+                                                      <node concept="2ShNRf" id="51ek2rQxWIi" role="10QFUP">
+                                                        <node concept="1pGfFk" id="51ek2rQxWIj" role="2ShVmc">
+                                                          <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
+                                                          <node concept="2OqwBi" id="51ek2rQxWIk" role="37wK5m">
+                                                            <node concept="37vLTw" id="51ek2rQxWIl" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="KkWtiKlLwV" resolve="traceEvents" />
+                                                            </node>
+                                                            <node concept="liA8E" id="51ek2rQxWIm" role="2OqNvi">
+                                                              <ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
+                                                            </node>
+                                                          </node>
+                                                          <node concept="37vLTw" id="51ek2rQxWIn" role="37wK5m">
+                                                            <ref role="3cqZAo" node="5lpFZvO4NRX" resolve="evalTrace" />
+                                                          </node>
+                                                        </node>
+                                                      </node>
+                                                      <node concept="3uibUv" id="51ek2rQxWIo" role="10QFUM">
+                                                        <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3clFbF" id="36y_5CtZPon" role="3cqZAp">
+                                                <node concept="2OqwBi" id="36y_5CtZPop" role="3clFbG">
+                                                  <node concept="2OqwBi" id="36y_5CtZPoq" role="2Oq$k0">
+                                                    <node concept="37vLTw" id="36y_5CtZPor" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="36y_5CtZMGy" resolve="out" />
+                                                    </node>
+                                                    <node concept="liA8E" id="36y_5CtZPos" role="2OqNvi">
+                                                      <ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
+                                                      <node concept="10M0yZ" id="7Vnjo8LOoam" role="37wK5m">
+                                                        <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
+                                                        <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
+                                                      </node>
+                                                      <node concept="37vLTw" id="36y_5CtZPou" role="37wK5m">
+                                                        <ref role="3cqZAo" node="51ek2rQxWIe" resolve="evtrace" />
+                                                      </node>
+                                                    </node>
+                                                  </node>
+                                                  <node concept="liA8E" id="36y_5CtZPov" role="2OqNvi">
+                                                    <ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
+                                                    <node concept="37vLTw" id="36y_5CtZPo_" role="37wK5m">
+                                                      <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                                                    </node>
+                                                    <node concept="37vLTw" id="36y_5CtZPow" role="37wK5m">
+                                                      <ref role="3cqZAo" node="KkWtiKlLwV" resolve="traceEvents" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3clFbH" id="5lpFZvO5F$f" role="3cqZAp" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
                                   </node>
                                   <node concept="3clFbC" id="KkWtiKmd28" role="3clFbw">
                                     <node concept="10Nm6u" id="KkWtiKmf78" role="3uHU7w" />
@@ -3395,88 +3477,6 @@
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3clFbF" id="5lpFZvO4Wcm" role="3cqZAp">
-                                  <node concept="2OqwBi" id="5lpFZvO4Xwg" role="3clFbG">
-                                    <node concept="37vLTw" id="5lpFZvO4Wck" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="51ek2rQxWIP" resolve="inEff" />
-                                    </node>
-                                    <node concept="liA8E" id="5lpFZvO4Zq7" role="2OqNvi">
-                                      <ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="doWithValue" />
-                                      <node concept="10M0yZ" id="7Vnjo8LOnak" role="37wK5m">
-                                        <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
-                                        <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                      </node>
-                                      <node concept="1bVj0M" id="5lpFZvO55VX" role="37wK5m">
-                                        <node concept="gl6BB" id="5lpFZvO4NRX" role="1bW2Oz">
-                                          <property role="TrG5h" value="evalTrace" />
-                                          <node concept="2jxLKc" id="5lpFZvO4NRY" role="1tU5fm" />
-                                        </node>
-                                        <node concept="3clFbS" id="5lpFZvO55Wc" role="1bW5cS">
-                                          <node concept="3cpWs8" id="51ek2rQxWId" role="3cqZAp">
-                                            <node concept="3cpWsn" id="51ek2rQxWIe" role="3cpWs9">
-                                              <property role="TrG5h" value="evtrace" />
-                                              <node concept="3uibUv" id="51ek2rQxWIf" role="1tU5fm">
-                                                <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                                              </node>
-                                              <node concept="1eOMI4" id="51ek2rQxWIg" role="33vP2m">
-                                                <node concept="10QFUN" id="51ek2rQxWIh" role="1eOMHV">
-                                                  <node concept="2ShNRf" id="51ek2rQxWIi" role="10QFUP">
-                                                    <node concept="1pGfFk" id="51ek2rQxWIj" role="2ShVmc">
-                                                      <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
-                                                      <node concept="2OqwBi" id="51ek2rQxWIk" role="37wK5m">
-                                                        <node concept="37vLTw" id="51ek2rQxWIl" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="KkWtiKlLwV" resolve="traceEvents" />
-                                                        </node>
-                                                        <node concept="liA8E" id="51ek2rQxWIm" role="2OqNvi">
-                                                          <ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
-                                                        </node>
-                                                      </node>
-                                                      <node concept="37vLTw" id="51ek2rQxWIn" role="37wK5m">
-                                                        <ref role="3cqZAo" node="5lpFZvO4NRX" resolve="evalTrace" />
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                  <node concept="3uibUv" id="51ek2rQxWIo" role="10QFUM">
-                                                    <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="3clFbF" id="36y_5CtZPon" role="3cqZAp">
-                                            <node concept="2OqwBi" id="36y_5CtZPop" role="3clFbG">
-                                              <node concept="2OqwBi" id="36y_5CtZPoq" role="2Oq$k0">
-                                                <node concept="37vLTw" id="36y_5CtZPor" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="36y_5CtZMGy" resolve="of" />
-                                                </node>
-                                                <node concept="liA8E" id="36y_5CtZPos" role="2OqNvi">
-                                                  <ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
-                                                  <node concept="10M0yZ" id="7Vnjo8LOoam" role="37wK5m">
-                                                    <ref role="3cqZAo" node="RZQG98Ve3Q" resolve="TRACE_EVAL" />
-                                                    <ref role="1PxDUh" node="RZQG98UNsT" resolve="ConfigureEvalStep" />
-                                                  </node>
-                                                  <node concept="37vLTw" id="36y_5CtZPou" role="37wK5m">
-                                                    <ref role="3cqZAo" node="51ek2rQxWIe" resolve="evtrace" />
-                                                  </node>
-                                                </node>
-                                              </node>
-                                              <node concept="liA8E" id="36y_5CtZPov" role="2OqNvi">
-                                                <ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
-                                                <node concept="37vLTw" id="36y_5CtZPo_" role="37wK5m">
-                                                  <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
-                                                </node>
-                                                <node concept="37vLTw" id="36y_5CtZPow" role="37wK5m">
-                                                  <ref role="3cqZAo" node="KkWtiKlLwV" resolve="traceEvents" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="3clFbH" id="5lpFZvO5F$f" role="3cqZAp" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
                               </node>
                             </node>
                           </node>