From ba8ccfce0324492468ab63f40f44e2e0fdcd9b70 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Thu, 10 Dec 2020 20:38:50 +0300
Subject: [PATCH] minor: Disable incremental option (that controls Preamble
 also) for lambdacalc tests

Preamble optimization requires same contracts from programs as full incrementality.
---
 ...ins.mps.coderules.typechecking.service.mps |  36 +-
 .../models/samples.lambdacalc.demo@tests.mps  | 539 ++++++++++--------
 2 files changed, 331 insertions(+), 244 deletions(-)

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 6d90d203..c6ff9808 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
@@ -867,6 +867,30 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="8aYibnfYOE" role="jymVt" />
+      <node concept="3clFb_" id="8aYibng9mM" role="jymVt">
+        <property role="TrG5h" value="withoutIncremental" />
+        <node concept="3clFbS" id="8aYibng9mP" role="3clF47">
+          <node concept="3clFbF" id="8aYibngeFZ" role="3cqZAp">
+            <node concept="37vLTI" id="8aYibngLuc" role="3clFbG">
+              <node concept="3clFbT" id="8aYibngL$6" role="37vLTx" />
+              <node concept="2OqwBi" id="8aYibngeMH" role="37vLTJ">
+                <node concept="Xjq3P" id="8aYibngeFY" role="2Oq$k0" />
+                <node concept="2OwXpG" id="8aYibngKVP" role="2OqNvi">
+                  <ref role="2Oxat5" node="8aYibngo_I" resolve="incremental" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="8aYibngLPv" role="3cqZAp">
+            <node concept="Xjq3P" id="8aYibngLPt" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="8aYibng4l7" role="1B3o_S" />
+        <node concept="3uibUv" id="8aYibng8NF" role="3clF45">
+          <ref role="3uigEE" node="27bTNFfaJxq" resolve="TypecheckingTestHelper.Checker" />
+        </node>
+      </node>
       <node concept="2tJIrI" id="4ZGicUYVMR_" role="jymVt" />
       <node concept="3clFb_" id="27bTNFfaYS2" role="jymVt">
         <property role="TrG5h" value="checkTypes" />
@@ -996,8 +1020,8 @@
                         <node concept="3clFbJ" id="53SlZu3VvPF" role="3cqZAp">
                           <node concept="3clFbS" id="53SlZu3VvPG" role="3clFbx">
                             <node concept="3cpWs6" id="53SlZu3VvPH" role="3cqZAp">
-                              <node concept="3clFbT" id="53SlZu3VvPI" role="3cqZAk">
-                                <property role="3clFbU" value="true" />
+                              <node concept="37vLTw" id="8aYibngBNL" role="3cqZAk">
+                                <ref role="3cqZAo" node="8aYibngo_I" resolve="incremental" />
                               </node>
                             </node>
                           </node>
@@ -2782,6 +2806,14 @@
           <property role="3clFbU" value="true" />
         </node>
       </node>
+      <node concept="312cEg" id="8aYibngo_I" role="jymVt">
+        <property role="TrG5h" value="incremental" />
+        <node concept="3Tm6S6" id="8aYibngk6d" role="1B3o_S" />
+        <node concept="10P_77" id="8aYibngohi" role="1tU5fm" />
+        <node concept="3clFbT" id="8aYibngsLg" role="33vP2m">
+          <property role="3clFbU" value="true" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2Qe6u2c7Uvv" role="jymVt" />
     <node concept="312cEu" id="1FOQehxyYXm" role="jymVt">
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 369ab05f..c6d96113 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -240,38 +240,43 @@
       <node concept="3clFbS" id="1GGmKhcBrSc" role="3clF47">
         <node concept="2Hmddi" id="1GGmKhcBrSd" role="3cqZAp">
           <node concept="2OqwBi" id="1GGmKhcBrSe" role="2Hmdds">
-            <node concept="2OqwBi" id="1GGmKhcBrSf" role="2Oq$k0">
-              <node concept="2YIFZM" id="1GGmKhcBrSg" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="1GGmKhcBrSh" role="37wK5m">
-                  <node concept="2WthIp" id="1GGmKhcBrSi" role="2Oq$k0" />
-                  <node concept="2XshWL" id="1GGmKhcBrSj" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="1GGmKhcBrSk" role="2XxRq1">
-                      <node concept="ZC_QK" id="1GGmKhcBt20" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:1GGmKhcBn5m" resolve="DemoSmall" />
+            <node concept="2OqwBi" id="8aYibngZ$r" role="2Oq$k0">
+              <node concept="2OqwBi" id="1GGmKhcBrSf" role="2Oq$k0">
+                <node concept="2YIFZM" id="1GGmKhcBrSg" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="1GGmKhcBrSh" role="37wK5m">
+                    <node concept="2WthIp" id="1GGmKhcBrSi" role="2Oq$k0" />
+                    <node concept="2XshWL" id="1GGmKhcBrSj" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="1GGmKhcBrSk" role="2XxRq1">
+                        <node concept="ZC_QK" id="1GGmKhcBt20" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:1GGmKhcBn5m" resolve="DemoSmall" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="1GGmKhcBrSm" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="1GGmKhcBrSm" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="1GGmKhcBrSn" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="1GGmKhcBrSo" role="37wK5m">
-                  <node concept="3clFbS" id="1GGmKhcBrSp" role="1bW5cS">
-                    <node concept="3clFbF" id="1GGmKhcBrSq" role="3cqZAp">
-                      <node concept="2OqwBi" id="1GGmKhcBrSr" role="3clFbG">
-                        <node concept="2WthIp" id="1GGmKhcBrSs" role="2Oq$k0" />
-                        <node concept="2XshWL" id="1GGmKhcBrSt" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="1GGmKhcBrSn" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="1GGmKhcBrSo" role="37wK5m">
+                    <node concept="3clFbS" id="1GGmKhcBrSp" role="1bW5cS">
+                      <node concept="3clFbF" id="1GGmKhcBrSq" role="3cqZAp">
+                        <node concept="2OqwBi" id="1GGmKhcBrSr" role="3clFbG">
+                          <node concept="2WthIp" id="1GGmKhcBrSs" role="2Oq$k0" />
+                          <node concept="2XshWL" id="1GGmKhcBrSt" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngZEY" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="1GGmKhcBrSu" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -286,38 +291,43 @@
       <node concept="3clFbS" id="5s5QomKHHK6" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwSx" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwSy" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwSz" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwS$" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbVCh" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbVCi" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbVCj" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbVCk" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbVCl" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
+            <node concept="2OqwBi" id="8aYibngWi5" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwSz" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwS$" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbVCh" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbVCi" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbVCj" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbVCk" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbVCl" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:4dPZ2m2jNim" resolve="Demo" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbVgO" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbVgO" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="4ZGicUZkED9" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkEDa" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkEDb" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkEDc" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkEDd" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkEDe" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkEDf" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="4ZGicUZkED9" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="4ZGicUZkEDa" role="37wK5m">
+                    <node concept="3clFbS" id="4ZGicUZkEDb" role="1bW5cS">
+                      <node concept="3clFbF" id="4ZGicUZkEDc" role="3cqZAp">
+                        <node concept="2OqwBi" id="4ZGicUZkEDd" role="3clFbG">
+                          <node concept="2WthIp" id="4ZGicUZkEDe" role="2Oq$k0" />
+                          <node concept="2XshWL" id="4ZGicUZkEDf" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngXjb" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwSC" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -332,38 +342,43 @@
       <node concept="3clFbS" id="6EwjVjWv74_" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbxw0" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbxw1" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbMeC" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbxw2" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="27bTNFfbVHV" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbVHW" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbVHX" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbVHY" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbVHZ" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
+            <node concept="2OqwBi" id="8aYibngXqC" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbMeC" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbxw2" role="2Oq$k0">
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <node concept="2OqwBi" id="27bTNFfbVHV" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbVHW" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbVHX" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbVHY" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbVHZ" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:G788z3ofcS" resolve="Fix" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbVEe" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbVEe" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2BgB$z0LwU_" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LwUA" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LwUB" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LwUC" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LwUD" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LwUE" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LwUF" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="2BgB$z0LwU_" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="2BgB$z0LwUA" role="37wK5m">
+                    <node concept="3clFbS" id="2BgB$z0LwUB" role="1bW5cS">
+                      <node concept="3clFbF" id="2BgB$z0LwUC" role="3cqZAp">
+                        <node concept="2OqwBi" id="2BgB$z0LwUD" role="3clFbG">
+                          <node concept="2WthIp" id="2BgB$z0LwUE" role="2Oq$k0" />
+                          <node concept="2XshWL" id="2BgB$z0LwUF" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngXrG" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbxw5" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -378,38 +393,43 @@
       <node concept="3clFbS" id="6EwjVjWv0Y5" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwTb" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwTc" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwTd" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwTe" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbW4I" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbW4J" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbW4K" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbW4L" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbW4M" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
+            <node concept="2OqwBi" id="8aYibngXDU" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwTd" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwTe" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbW4I" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbW4J" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbW4K" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbW4L" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbW4M" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:oyq0R0e9lD" resolve="Peculiar" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbW6J" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbW6J" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="4ZGicUZkKZL" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkKZM" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkKZN" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkKZO" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkKZP" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkKZQ" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkKZR" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="4ZGicUZkKZL" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="4ZGicUZkKZM" role="37wK5m">
+                    <node concept="3clFbS" id="4ZGicUZkKZN" role="1bW5cS">
+                      <node concept="3clFbF" id="4ZGicUZkKZO" role="3cqZAp">
+                        <node concept="2OqwBi" id="4ZGicUZkKZP" role="3clFbG">
+                          <node concept="2WthIp" id="4ZGicUZkKZQ" role="2Oq$k0" />
+                          <node concept="2XshWL" id="4ZGicUZkKZR" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngXMs" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwTi" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -424,38 +444,43 @@
       <node concept="3clFbS" id="6EwjVjWvpYI" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwTP" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwTQ" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwTR" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwTS" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbW8C" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbW8D" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbW8E" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbW8F" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbW8G" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
+            <node concept="2OqwBi" id="8aYibngXUi" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwTR" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwTS" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbW8C" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbW8D" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbW8E" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbW8F" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbW8G" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:7Et5j8uqHKT" resolve="SKI" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbWaD" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWaD" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2BgB$z0LEnt" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LEnu" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LEnv" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LEnw" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LEnx" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LEny" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LEnz" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="2BgB$z0LEnt" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="2BgB$z0LEnu" role="37wK5m">
+                    <node concept="3clFbS" id="2BgB$z0LEnv" role="1bW5cS">
+                      <node concept="3clFbF" id="2BgB$z0LEnw" role="3cqZAp">
+                        <node concept="2OqwBi" id="2BgB$z0LEnx" role="3clFbG">
+                          <node concept="2WthIp" id="2BgB$z0LEny" role="2Oq$k0" />
+                          <node concept="2XshWL" id="2BgB$z0LEnz" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngXVm" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwTW" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -470,38 +495,43 @@
       <node concept="3clFbS" id="6EwjVjWvvH6" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwUv" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwUw" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwUx" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwUy" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWvq" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWvr" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWvs" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWvt" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWvu" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
+            <node concept="2OqwBi" id="8aYibngY5z" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwUx" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwUy" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbWvq" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbWvr" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbWvs" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbWvt" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbWvu" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:7_8aRkgE06U" resolve="Numerals" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbWxr" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWxr" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="4ZGicUZkV9_" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="4ZGicUZkV9A" role="37wK5m">
-                  <node concept="3clFbS" id="4ZGicUZkV9B" role="1bW5cS">
-                    <node concept="3clFbF" id="4ZGicUZkV9C" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ZGicUZkV9D" role="3clFbG">
-                        <node concept="2WthIp" id="4ZGicUZkV9E" role="2Oq$k0" />
-                        <node concept="2XshWL" id="4ZGicUZkV9F" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="4ZGicUZkV9_" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="4ZGicUZkV9A" role="37wK5m">
+                    <node concept="3clFbS" id="4ZGicUZkV9B" role="1bW5cS">
+                      <node concept="3clFbF" id="4ZGicUZkV9C" role="3cqZAp">
+                        <node concept="2OqwBi" id="4ZGicUZkV9D" role="3clFbG">
+                          <node concept="2WthIp" id="4ZGicUZkV9E" role="2Oq$k0" />
+                          <node concept="2XshWL" id="4ZGicUZkV9F" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngY6B" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwUA" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -516,38 +546,43 @@
       <node concept="3clFbS" id="6EwjVjWvydT" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwV9" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwVa" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwVb" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwVc" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWzk" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWzl" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWzm" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWzn" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWzo" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
+            <node concept="2OqwBi" id="8aYibngYh1" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwVb" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwVc" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbWzk" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbWzl" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbWzm" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbWzn" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbWzo" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:nOeFRaGxm_" resolve="Omega" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbW_l" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbW_l" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2BgB$z0LLkJ" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LLkK" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LLkL" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LLkM" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LLkN" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LLkO" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LLkP" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="2BgB$z0LLkJ" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="2BgB$z0LLkK" role="37wK5m">
+                    <node concept="3clFbS" id="2BgB$z0LLkL" role="1bW5cS">
+                      <node concept="3clFbF" id="2BgB$z0LLkM" role="3cqZAp">
+                        <node concept="2OqwBi" id="2BgB$z0LLkN" role="3clFbG">
+                          <node concept="2WthIp" id="2BgB$z0LLkO" role="2Oq$k0" />
+                          <node concept="2XshWL" id="2BgB$z0LLkP" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngYi5" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwVg" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -562,38 +597,43 @@
       <node concept="3clFbS" id="6EwjVjWvyrY" role="3clF47">
         <node concept="2Hmddi" id="27bTNFfbwVN" role="3cqZAp">
           <node concept="2OqwBi" id="27bTNFfbwVO" role="2Hmdds">
-            <node concept="2OqwBi" id="27bTNFfbwVP" role="2Oq$k0">
-              <node concept="2YIFZM" id="27bTNFfbwVQ" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="27bTNFfbWBe" role="37wK5m">
-                  <node concept="2WthIp" id="27bTNFfbWBf" role="2Oq$k0" />
-                  <node concept="2XshWL" id="27bTNFfbWBg" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="27bTNFfbWBh" role="2XxRq1">
-                      <node concept="ZC_QK" id="27bTNFfbWBi" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
+            <node concept="2OqwBi" id="8aYibngYwT" role="2Oq$k0">
+              <node concept="2OqwBi" id="27bTNFfbwVP" role="2Oq$k0">
+                <node concept="2YIFZM" id="27bTNFfbwVQ" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="27bTNFfbWBe" role="37wK5m">
+                    <node concept="2WthIp" id="27bTNFfbWBf" role="2Oq$k0" />
+                    <node concept="2XshWL" id="27bTNFfbWBg" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="27bTNFfbWBh" role="2XxRq1">
+                        <node concept="ZC_QK" id="27bTNFfbWBi" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:1PL$JmLA85j" resolve="Y_combinator" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="27bTNFfbWDf" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="27bTNFfbWDf" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="2BgB$z0LMIC" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="2BgB$z0LMID" role="37wK5m">
-                  <node concept="3clFbS" id="2BgB$z0LMIE" role="1bW5cS">
-                    <node concept="3clFbF" id="2BgB$z0LMIF" role="3cqZAp">
-                      <node concept="2OqwBi" id="2BgB$z0LMIG" role="3clFbG">
-                        <node concept="2WthIp" id="2BgB$z0LMIH" role="2Oq$k0" />
-                        <node concept="2XshWL" id="2BgB$z0LMII" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="2BgB$z0LMIC" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="2BgB$z0LMID" role="37wK5m">
+                    <node concept="3clFbS" id="2BgB$z0LMIE" role="1bW5cS">
+                      <node concept="3clFbF" id="2BgB$z0LMIF" role="3cqZAp">
+                        <node concept="2OqwBi" id="2BgB$z0LMIG" role="3clFbG">
+                          <node concept="2WthIp" id="2BgB$z0LMIH" role="2Oq$k0" />
+                          <node concept="2XshWL" id="2BgB$z0LMII" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngYxX" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="27bTNFfbwVU" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -608,38 +648,43 @@
       <node concept="3clFbS" id="1IKbs5XIs8L" role="3clF47">
         <node concept="2Hmddi" id="RcyXiSVPlH" role="3cqZAp">
           <node concept="2OqwBi" id="RcyXiSVPlI" role="2Hmdds">
-            <node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
-              <node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
-                  <node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
-                  <node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
-                      <node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
+            <node concept="2OqwBi" id="8aYibngZgZ" role="2Oq$k0">
+              <node concept="2OqwBi" id="RcyXiSVPlJ" role="2Oq$k0">
+                <node concept="2YIFZM" id="RcyXiSVPlK" role="2Oq$k0">
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <node concept="2OqwBi" id="RcyXiSVPlL" role="37wK5m">
+                    <node concept="2WthIp" id="RcyXiSVPlM" role="2Oq$k0" />
+                    <node concept="2XshWL" id="RcyXiSVPlN" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="RcyXiSVPlO" role="2XxRq1">
+                        <node concept="ZC_QK" id="RcyXiSVPvg" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:JqEP$8t9fh" resolve="DemoScopes" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="RcyXiSVPlQ" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="73aHugggP6K" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="73aHugggP6L" role="37wK5m">
-                  <node concept="3clFbS" id="73aHugggP6M" role="1bW5cS">
-                    <node concept="3clFbF" id="73aHugggP6N" role="3cqZAp">
-                      <node concept="2OqwBi" id="73aHugggP6O" role="3clFbG">
-                        <node concept="2WthIp" id="73aHugggP6P" role="2Oq$k0" />
-                        <node concept="2XshWL" id="73aHugggP6Q" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="73aHugggP6K" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="73aHugggP6L" role="37wK5m">
+                    <node concept="3clFbS" id="73aHugggP6M" role="1bW5cS">
+                      <node concept="3clFbF" id="73aHugggP6N" role="3cqZAp">
+                        <node concept="2OqwBi" id="73aHugggP6O" role="3clFbG">
+                          <node concept="2WthIp" id="73aHugggP6P" role="2Oq$k0" />
+                          <node concept="2XshWL" id="73aHugggP6Q" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngZra" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="RcyXiSVPlS" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -654,38 +699,43 @@
       <node concept="3clFbS" id="47tET_Xohmt" role="3clF47">
         <node concept="2Hmddi" id="47tET_Xohmu" role="3cqZAp">
           <node concept="2OqwBi" id="47tET_Xohmv" role="2Hmdds">
-            <node concept="2OqwBi" id="47tET_Xohmw" role="2Oq$k0">
-              <node concept="2YIFZM" id="47tET_Xohmx" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="47tET_Xohmy" role="37wK5m">
-                  <node concept="2WthIp" id="47tET_Xohmz" role="2Oq$k0" />
-                  <node concept="2XshWL" id="47tET_Xohm$" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="47tET_Xohm_" role="2XxRq1">
-                      <node concept="ZC_QK" id="47tET_XohUr" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:47tET_WGoBb" resolve="DemoTypeclasses" />
+            <node concept="2OqwBi" id="8aYibngYT4" role="2Oq$k0">
+              <node concept="2OqwBi" id="47tET_Xohmw" role="2Oq$k0">
+                <node concept="2YIFZM" id="47tET_Xohmx" role="2Oq$k0">
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <node concept="2OqwBi" id="47tET_Xohmy" role="37wK5m">
+                    <node concept="2WthIp" id="47tET_Xohmz" role="2Oq$k0" />
+                    <node concept="2XshWL" id="47tET_Xohm$" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="47tET_Xohm_" role="2XxRq1">
+                        <node concept="ZC_QK" id="47tET_XohUr" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:47tET_WGoBb" resolve="DemoTypeclasses" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="47tET_XohmB" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="47tET_XohmB" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="73aHuggheTU" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="73aHuggheTV" role="37wK5m">
-                  <node concept="3clFbS" id="73aHuggheTW" role="1bW5cS">
-                    <node concept="3clFbF" id="73aHuggheTX" role="3cqZAp">
-                      <node concept="2OqwBi" id="73aHuggheTY" role="3clFbG">
-                        <node concept="2WthIp" id="73aHuggheTZ" role="2Oq$k0" />
-                        <node concept="2XshWL" id="73aHuggheU0" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="73aHuggheTU" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="73aHuggheTV" role="37wK5m">
+                    <node concept="3clFbS" id="73aHuggheTW" role="1bW5cS">
+                      <node concept="3clFbF" id="73aHuggheTX" role="3cqZAp">
+                        <node concept="2OqwBi" id="73aHuggheTY" role="3clFbG">
+                          <node concept="2WthIp" id="73aHuggheTZ" role="2Oq$k0" />
+                          <node concept="2XshWL" id="73aHuggheU0" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngZ2L" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="47tET_XohmD" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
@@ -700,38 +750,43 @@
       <node concept="3clFbS" id="47tET_XoiCx" role="3clF47">
         <node concept="2Hmddi" id="47tET_XoiCy" role="3cqZAp">
           <node concept="2OqwBi" id="47tET_XoiCz" role="2Hmdds">
-            <node concept="2OqwBi" id="47tET_XoiC$" role="2Oq$k0">
-              <node concept="2YIFZM" id="47tET_XoiC_" role="2Oq$k0">
-                <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
-                <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
-                <node concept="2OqwBi" id="47tET_XoiCA" role="37wK5m">
-                  <node concept="2WthIp" id="47tET_XoiCB" role="2Oq$k0" />
-                  <node concept="2XshWL" id="47tET_XoiCC" role="2OqNvi">
-                    <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
-                    <node concept="2tJFMh" id="47tET_XoiCD" role="2XxRq1">
-                      <node concept="ZC_QK" id="47tET_Xoj9p" role="2tJFKM">
-                        <ref role="2aWVGs" to="ysck:2O9ahh6x9Cb" resolve="DemoConstraints" />
+            <node concept="2OqwBi" id="8aYibngYGZ" role="2Oq$k0">
+              <node concept="2OqwBi" id="47tET_XoiC$" role="2Oq$k0">
+                <node concept="2YIFZM" id="47tET_XoiC_" role="2Oq$k0">
+                  <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+                  <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+                  <node concept="2OqwBi" id="47tET_XoiCA" role="37wK5m">
+                    <node concept="2WthIp" id="47tET_XoiCB" role="2Oq$k0" />
+                    <node concept="2XshWL" id="47tET_XoiCC" role="2OqNvi">
+                      <ref role="2WH_rO" node="35YJGAJTxCf" resolve="resolve" />
+                      <node concept="2tJFMh" id="47tET_XoiCD" role="2XxRq1">
+                        <node concept="ZC_QK" id="47tET_Xoj9p" role="2tJFKM">
+                          <ref role="2aWVGs" to="ysck:2O9ahh6x9Cb" resolve="DemoConstraints" />
+                        </node>
                       </node>
                     </node>
                   </node>
+                  <node concept="1jxXqW" id="47tET_XoiCF" role="37wK5m" />
                 </node>
-                <node concept="1jxXqW" id="47tET_XoiCF" role="37wK5m" />
-              </node>
-              <node concept="liA8E" id="73aHugghosD" role="2OqNvi">
-                <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
-                <node concept="1bVj0M" id="73aHugghosE" role="37wK5m">
-                  <node concept="3clFbS" id="73aHugghosF" role="1bW5cS">
-                    <node concept="3clFbF" id="73aHugghosG" role="3cqZAp">
-                      <node concept="2OqwBi" id="73aHugghosH" role="3clFbG">
-                        <node concept="2WthIp" id="73aHugghosI" role="2Oq$k0" />
-                        <node concept="2XshWL" id="73aHugghosJ" role="2OqNvi">
-                          <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                <node concept="liA8E" id="73aHugghosD" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:4ZGicUYVP43" resolve="customMatcher" />
+                  <node concept="1bVj0M" id="73aHugghosE" role="37wK5m">
+                    <node concept="3clFbS" id="73aHugghosF" role="1bW5cS">
+                      <node concept="3clFbF" id="73aHugghosG" role="3cqZAp">
+                        <node concept="2OqwBi" id="73aHugghosH" role="3clFbG">
+                          <node concept="2WthIp" id="73aHugghosI" role="2Oq$k0" />
+                          <node concept="2XshWL" id="73aHugghosJ" role="2OqNvi">
+                            <ref role="2WH_rO" node="4ZGicUYXn0k" resolve="customMatcher" />
+                          </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="liA8E" id="8aYibngYI3" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:8aYibng9mM" resolve="withoutIncremental" />
+              </node>
             </node>
             <node concept="liA8E" id="47tET_XoiCH" role="2OqNvi">
               <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />