diff --git a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
index 02d13aac..3fcc0fb1 100644
--- a/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.lang.generator.generationContextExt/models/jetbrains.mps.lang.generator.generationContextExt.types.mps
@@ -711,107 +711,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="3ZfjIHuvfzo" role="1nK1Vg">
-      <property role="TrG5h" value="generationContextOp_DirtyNode" />
-      <node concept="3clFbS" id="3ZfjIHuvfzp" role="1nLNMH">
-        <node concept="1nLNNL" id="3ZfjIHuvfEt" role="3cqZAp">
-          <node concept="1nLNMm" id="3ZfjIHuvfEu" role="1nLNNK">
-            <node concept="3Aq93q" id="3ZfjIHuvfEx" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="3ZfjIHuvfEy" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3ZfjIHuvfEA" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3ZfjIHuvfE_" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3xSepi" id="3ZfjIHuvfED" role="3xSepv">
-              <node concept="3Aq9E8" id="3ZfjIHuvfEE" role="3xSepj">
-                <node concept="3I6sU6" id="3ZfjIHuvfEF" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3ZfjIHuvfEK" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3ZfjIHuvfEJ" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="3ZfjIHuvfER" role="3AunhB">
-                        <node concept="3A2sRY" id="3ZfjIHuvfEP" role="37jj2">
-                          <ref role="3A2yKK" node="3ZfjIHuvfzr" resolve="gcodn" />
-                        </node>
-                      </node>
-                      <node concept="ns1u0" id="3ZfjIHuvfFF" role="3AunhB">
-                        <ref role="ns1xF" to="kqnc:JOGAOsVt36" resolve="_boolean_" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3ZfjIHuvfFJ" role="3cqZAp" />
-        <node concept="1nLNNL" id="3ZfjIHuvfGg" role="3cqZAp">
-          <node concept="1nLNMm" id="3ZfjIHuvfGi" role="1nLNNK">
-            <node concept="3Aq93q" id="3ZfjIHuvfG_" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="3ZfjIHuvfGA" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3ZfjIHuvfGE" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3ZfjIHuvfGD" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="3ZfjIHuvfHm" role="3AunhB">
-                      <node concept="2OqwBi" id="3ZfjIHuvfPX" role="37jj2">
-                        <node concept="3A2sRY" id="3ZfjIHuvfHk" role="2Oq$k0">
-                          <ref role="3A2yKK" node="3ZfjIHuvfzr" resolve="gcodn" />
-                        </node>
-                        <node concept="3TrEf2" id="3ZfjIHuvg03" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpf3:4FXH7d67CLU" resolve="nodeToCheck" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="3ZfjIHuvg2t" role="3AunhB">
-                      <ref role="a7OzE" node="3ZfjIHuvfGP" resolve="Type" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="3ZfjIHuvfGO" role="0Rg$4">
-              <node concept="aZer4" id="3ZfjIHuvfGP" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="3ZfjIHuvfH1" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="3ZfjIHuvg2C" role="3xSepv">
-              <node concept="3Aq9E8" id="3ZfjIHuvg2D" role="3xSepj">
-                <node concept="3I6sU6" id="3ZfjIHuvg2E" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3ZfjIHuvg2J" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3ZfjIHuvg2I" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:3vTJNooZDgN" resolve="convertsTo" />
-                      <node concept="a7P8L" id="3ZfjIHuvg2X" role="3AunhB">
-                        <ref role="a7OzE" node="3ZfjIHuvfGP" resolve="Type" />
-                      </node>
-                      <node concept="ns1u0" id="3ZfjIHuvg4D" role="3AunhB">
-                        <ref role="ns1xF" to="jxwi:7LI_gNMWw2A" resolve="node" />
-                      </node>
-                      <node concept="37jhX" id="3ZfjIHuvg6Z" role="3AunhB">
-                        <node concept="2YIFZM" id="3ZfjIHuvg70" role="37jj2">
-                          <ref role="37wK5l" to="kqnc:6GOqnFkHuAN" resolve="strictestContetxt" />
-                          <ref role="1Pybhc" to="kqnc:4O7HczOeKN2" resolve="ConvertsContext" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="3ZfjIHuvfzq" role="1nLNMg">
-        <ref role="2t_S0q" to="tpf3:4FXH7d67CLT" resolve="GenerationContextOp_DirtyNode" />
-        <node concept="3A20r5" id="3ZfjIHuvfzr" role="2t_VXX">
-          <property role="TrG5h" value="gcodn" />
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="3ZfjIHuvgAF" role="1nK1Vg">
       <property role="TrG5h" value="generationContextOp_GenParameterRef" />
       <node concept="3clFbS" id="3ZfjIHuvgAG" role="1nLNMH">
@@ -2470,69 +2369,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="3ZfjIHuwcTh" role="1nK1Vg">
-      <property role="TrG5h" value="generationContextOp_VarRef" />
-      <node concept="3clFbS" id="3ZfjIHuwcTi" role="1nLNMH">
-        <node concept="1nLNNL" id="3ZfjIHuwddD" role="3cqZAp">
-          <node concept="1nLNMm" id="3ZfjIHuwddE" role="1nLNNK">
-            <node concept="3Aq93q" id="3ZfjIHuwddH" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="3ZfjIHuwddI" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3ZfjIHuwddM" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3ZfjIHuwddL" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                    <node concept="37jhX" id="3ZfjIHuwdeo" role="3AunhB">
-                      <node concept="2OqwBi" id="3ZfjIHuwdmZ" role="37jj2">
-                        <node concept="3A2sRY" id="3ZfjIHuwdem" role="2Oq$k0">
-                          <ref role="3A2yKK" node="3ZfjIHuwcTk" resolve="gcovr" />
-                        </node>
-                        <node concept="3TrEf2" id="3ZfjIHuwdEW" role="2OqNvi">
-                          <ref role="3Tt5mk" to="tpf3:2n6lsTIwfRq" resolve="varmacro" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="3ZfjIHuwdHm" role="3AunhB">
-                      <ref role="a7OzE" node="3ZfjIHuwddR" resolve="Type" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="3ZfjIHuwddQ" role="0Rg$4">
-              <node concept="aZer4" id="3ZfjIHuwddR" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="3ZfjIHuwde3" role="3vLBG7" />
-            </node>
-            <node concept="3xSepi" id="3ZfjIHuwdHx" role="3xSepv">
-              <node concept="3Aq9E8" id="3ZfjIHuwdHy" role="3xSepj">
-                <node concept="3I6sU6" id="3ZfjIHuwdHz" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3ZfjIHuwdHC" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3ZfjIHuwdHB" role="3I6s78">
-                      <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                      <node concept="37jhX" id="3ZfjIHuwdHJ" role="3AunhB">
-                        <node concept="3A2sRY" id="3ZfjIHuwdHH" role="37jj2">
-                          <ref role="3A2yKK" node="3ZfjIHuwcTk" resolve="gcovr" />
-                        </node>
-                      </node>
-                      <node concept="a7P8L" id="3ZfjIHuwdHZ" role="3AunhB">
-                        <ref role="a7OzE" node="3ZfjIHuwddR" resolve="Type" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="3ZfjIHuwcTj" role="1nLNMg">
-        <ref role="2t_S0q" to="tpf3:2n6lsTIwfRo" resolve="GenerationContextOp_VarRef" />
-        <node concept="3A20r5" id="3ZfjIHuwcTk" role="2t_VXX">
-          <property role="TrG5h" value="gcovr" />
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="3ZfjIHuwee1" role="1nK1Vg">
       <property role="TrG5h" value="generationContextOp_VarRef2" />
       <node concept="3clFbS" id="3ZfjIHuwee2" role="1nLNMH">
@@ -2596,121 +2432,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="3ZfjIHuwfoD" role="1nK1Vg">
-      <property role="TrG5h" value="varMacro" />
-      <node concept="3clFbS" id="3ZfjIHuwfoE" role="1nLNMH">
-        <node concept="1nLNNL" id="3ZfjIHuwfQ1" role="3cqZAp">
-          <node concept="1nLNMm" id="3ZfjIHuwfQ2" role="1nLNNK">
-            <node concept="3Aq93q" id="3ZfjIHuwfQ5" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="3ZfjIHuwfQ6" role="3Ip0Jz">
-                <node concept="3I6s7M" id="3ZfjIHuwfQa" role="3I6sU7">
-                  <node concept="3Aqt3T" id="3ZfjIHuwfQ9" role="3I6s78">
-                    <ref role="3AqCNq" to="kqnc:34$A1MfabR$" resolve="checkAll" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3xSepi" id="3ZfjIHuwfQd" role="3xSepv">
-              <node concept="3Aq9E8" id="3ZfjIHuwfQe" role="3xSepj">
-                <node concept="3I6sU6" id="3ZfjIHuwfQf" role="3Ip0Jz">
-                  <node concept="3IrJb3" id="3ZfjIHuwfQj" role="3I6sU7">
-                    <node concept="3clFbS" id="3ZfjIHuwfQk" role="3IrJb0">
-                      <node concept="3clFbJ" id="3ZfjIHuwfQn" role="3cqZAp">
-                        <node concept="2OqwBi" id="3ZfjIHuwgyJ" role="3clFbw">
-                          <node concept="2OqwBi" id="3ZfjIHuwg5G" role="2Oq$k0">
-                            <node concept="3A2sRY" id="3ZfjIHuwfQz" role="2Oq$k0">
-                              <ref role="3A2yKK" node="3ZfjIHuwfoG" resolve="vm" />
-                            </node>
-                            <node concept="3TrEf2" id="3ZfjIHuwgnU" role="2OqNvi">
-                              <ref role="3Tt5mk" to="tpf8:4mp7qFmD$jV" resolve="type" />
-                            </node>
-                          </node>
-                          <node concept="3x8VRR" id="3ZfjIHuwgLo" role="2OqNvi" />
-                        </node>
-                        <node concept="3clFbS" id="3ZfjIHuwfQp" role="3clFbx">
-                          <node concept="3Aqczg" id="3ZfjIHuwhgm" role="3cqZAp">
-                            <node concept="3jbYBd" id="3ZfjIHuwhgj" role="3Aqpz8">
-                              <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                              <node concept="2OqwBi" id="3ZfjIHuwhtG" role="3jbY8P">
-                                <node concept="3A2sRY" id="3ZfjIHuwhhg" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="3ZfjIHuwfoG" resolve="vm" />
-                                </node>
-                                <node concept="3TrEf2" id="3ZfjIHuwi6K" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpf8:4mp7qFmD$jV" resolve="type" />
-                                </node>
-                              </node>
-                              <node concept="a7P8L" id="3ZfjIHuwhh2" role="3jbY8V">
-                                <ref role="a7OzE" node="3ZfjIHuwhgu" resolve="Type" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="3Aqczg" id="3ZfjIHuwi74" role="3cqZAp">
-                            <node concept="3Aqt3T" id="3ZfjIHuwi72" role="3Aqpz8">
-                              <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                              <node concept="37jhX" id="3ZfjIHuwi7s" role="3AunhB">
-                                <node concept="3A2sRY" id="3ZfjIHuwi7q" role="37jj2">
-                                  <ref role="3A2yKK" node="3ZfjIHuwfoG" resolve="vm" />
-                                </node>
-                              </node>
-                              <node concept="a7P8L" id="3ZfjIHuwi7i" role="3AunhB">
-                                <ref role="a7OzE" node="3ZfjIHuwhgu" resolve="Type" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="9aQIb" id="3ZfjIHuwgPB" role="9aQIa">
-                          <node concept="3clFbS" id="3ZfjIHuwgPC" role="9aQI4">
-                            <node concept="3Aqczg" id="3ZfjIHuwgWK" role="3cqZAp">
-                              <node concept="3Aqt3T" id="3ZfjIHuwgWL" role="3Aqpz8">
-                                <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
-                                <node concept="37jhX" id="3ZfjIHuwgWM" role="3AunhB">
-                                  <node concept="3A2sRY" id="3ZfjIHuwh0c" role="37jj2">
-                                    <ref role="3A2yKK" node="3ZfjIHuwfoG" resolve="vm" />
-                                  </node>
-                                </node>
-                                <node concept="ns1u0" id="3ZfjIHuwgWO" role="3AunhB">
-                                  <ref role="ns1xF" to="kqnc:JOGAOsVt2a" resolve="classifier" />
-                                  <node concept="nsMwS" id="3ZfjIHuwgWP" role="ns1xD">
-                                    <ref role="nsMwP" to="kqnc:JOGAOsVt2c" resolve="classifier" />
-                                    <node concept="2OqwBi" id="3ZfjIHuwgWQ" role="nsMwV">
-                                      <node concept="2c44tf" id="3ZfjIHuwgWR" role="2Oq$k0">
-                                        <node concept="3uibUv" id="3ZfjIHuwgWS" role="2c44tc">
-                                          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                                        </node>
-                                      </node>
-                                      <node concept="3TrEf2" id="3ZfjIHuwgWT" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3NuqgR" id="3ZfjIHuwhgt" role="0Rg$4">
-              <node concept="aZer4" id="3ZfjIHuwhgu" role="3XD1gS">
-                <property role="TrG5h" value="Type" />
-              </node>
-              <node concept="32pEOW" id="3ZfjIHuwhgE" role="3vLBG7" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2t___k" id="3ZfjIHuwfoF" role="1nLNMg">
-        <ref role="2t_S0q" to="tpf8:4mp7qFmCXde" resolve="VarMacro" />
-        <node concept="3A20r5" id="3ZfjIHuwfoG" role="2t_VXX">
-          <property role="TrG5h" value="vm" />
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="AVZre" id="3ZfjIHuuW_J">
     <property role="TrG5h" value="conversions" />