diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
index 116bdff2..dcdc0fca 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/template/main@generator.mps
@@ -18433,135 +18433,6 @@
             </node>
           </node>
           <node concept="2tJIrI" id="4KRwoem6ilI" role="jymVt" />
-          <node concept="3clFb_" id="4MEOIDGBueD" role="jymVt">
-            <property role="TrG5h" value="typeNode" />
-            <node concept="3uibUv" id="4MEOIDGBCUY" role="3clF45">
-              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-            </node>
-            <node concept="3Tmbuc" id="4MEOIDGBx0G" role="1B3o_S" />
-            <node concept="3clFbS" id="4MEOIDGBueH" role="3clF47">
-              <node concept="3clFbF" id="4MEOIDGCfiE" role="3cqZAp">
-                <node concept="2OqwBi" id="4MEOIDGCfiG" role="3clFbG">
-                  <node concept="1eOMI4" id="4MEOIDGCfiH" role="2Oq$k0">
-                    <node concept="1nCR9W" id="4MEOIDGCfiI" role="1eOMHV">
-                      <property role="1nD$Q0" value="TermDeclaration" />
-                      <node concept="3clFbT" id="4MEOIDGCfiJ" role="2U2pNA" />
-                      <node concept="2OqwBi" id="4MEOIDGCm7c" role="2U2pNA">
-                        <node concept="Xjq3P" id="4MEOIDGClN8" role="2Oq$k0" />
-                        <node concept="2OwXpG" id="4MEOIDGCm_T" role="2OqNvi">
-                          <ref role="2Oxat5" node="1GNw78$lpLZ" resolve="param" />
-                          <node concept="1ZhdrF" id="4MEOIDGCq5t" role="lGtFl">
-                            <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
-                            <property role="2qtEX8" value="fieldDeclaration" />
-                            <node concept="3$xsQk" id="4MEOIDGCq5u" role="3$ytzL">
-                              <node concept="3clFbS" id="4MEOIDGCq5v" role="2VODD2">
-                                <node concept="3clFbF" id="4MEOIDGCqBg" role="3cqZAp">
-                                  <node concept="2OqwBi" id="4MEOIDGCqBh" role="3clFbG">
-                                    <node concept="1iwH7S" id="4MEOIDGCqBi" role="2Oq$k0" />
-                                    <node concept="1iwH70" id="4MEOIDGCqBj" role="2OqNvi">
-                                      <ref role="1iwH77" node="7IysFeAaXEh" resolve="typeParam_field" />
-                                      <node concept="30H73N" id="4MEOIDGCMnB" role="1iwH7V" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1WS0z7" id="4MEOIDGCmHs" role="lGtFl">
-                          <node concept="3JmXsc" id="4MEOIDGCmHu" role="3Jn$fo">
-                            <node concept="3clFbS" id="4MEOIDGCmHw" role="2VODD2">
-                              <node concept="3clFbF" id="4MEOIDGCpt4" role="3cqZAp">
-                                <node concept="2OqwBi" id="4MEOIDGCpt7" role="3clFbG">
-                                  <node concept="30H73N" id="4MEOIDGCpt8" role="2Oq$k0" />
-                                  <node concept="3Tsc0h" id="4MEOIDGCsZh" role="2OqNvi">
-                                    <ref role="3TtcxE" to="wq2x:7IysFeA0yca" resolve="parameter" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="1W57fq" id="4MEOIDGCt$g" role="lGtFl">
-                          <node concept="3IZrLx" id="4MEOIDGCt$i" role="3IZSJc">
-                            <node concept="3clFbS" id="4MEOIDGCt$k" role="2VODD2">
-                              <node concept="3cpWs8" id="4MEOIDGCJ5R" role="3cqZAp">
-                                <node concept="3cpWsn" id="4MEOIDGCJ5S" role="3cpWs9">
-                                  <property role="TrG5h" value="termArgsSize" />
-                                  <node concept="10Oyi0" id="4MEOIDGCJ5H" role="1tU5fm" />
-                                  <node concept="2OqwBi" id="4MEOIDGCJ5T" role="33vP2m">
-                                    <node concept="2OqwBi" id="4MEOIDGCJ5U" role="2Oq$k0">
-                                      <node concept="2OqwBi" id="4MEOIDGCJ5V" role="2Oq$k0">
-                                        <node concept="1PxgMI" id="4MEOIDGCJ5W" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="4MEOIDGCJ5X" role="1m5AlR">
-                                            <node concept="30H73N" id="4MEOIDGCJ5Y" role="2Oq$k0" />
-                                            <node concept="1mfA1w" id="4MEOIDGCJ5Z" role="2OqNvi" />
-                                          </node>
-                                          <node concept="chp4Y" id="6fXjIfxgnfU" role="3oSUPX">
-                                            <ref role="cht4Q" to="wq2x:1pPth$m5Bbz" resolve="TypeDeclaration" />
-                                          </node>
-                                        </node>
-                                        <node concept="3TrEf2" id="4MEOIDGCJ60" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                                        </node>
-                                      </node>
-                                      <node concept="3Tsc0h" id="4MEOIDGCJ61" role="2OqNvi">
-                                        <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                                      </node>
-                                    </node>
-                                    <node concept="34oBXx" id="4MEOIDGCJ62" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3clFbF" id="4MEOIDGCErC" role="3cqZAp">
-                                <node concept="3eOVzh" id="4MEOIDGCIe1" role="3clFbG">
-                                  <node concept="37vLTw" id="4MEOIDGCKV6" role="3uHU7w">
-                                    <ref role="3cqZAo" node="4MEOIDGCJ5S" resolve="termArgsSize" />
-                                  </node>
-                                  <node concept="2OqwBi" id="4MEOIDGCEO4" role="3uHU7B">
-                                    <node concept="30H73N" id="4MEOIDGCErA" role="2Oq$k0" />
-                                    <node concept="2bSWHS" id="4MEOIDGCFym" role="2OqNvi" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="4MEOIDGCfiW" role="2lIhxL">
-                        <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-                      </node>
-                      <node concept="17Uvod" id="4MEOIDGCfiX" role="lGtFl">
-                        <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
-                        <property role="2qtEX9" value="fqClassName" />
-                        <node concept="3zFVjK" id="4MEOIDGCfiY" role="3zH0cK">
-                          <node concept="3clFbS" id="4MEOIDGCfiZ" role="2VODD2">
-                            <node concept="3clFbF" id="4MEOIDGCfj0" role="3cqZAp">
-                              <node concept="2OqwBi" id="4MEOIDGCfj1" role="3clFbG">
-                                <node concept="2OqwBi" id="4MEOIDGCfj2" role="2Oq$k0">
-                                  <node concept="30H73N" id="4MEOIDGCfj4" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="4MEOIDGCfj6" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="4MEOIDGCfj7" role="2OqNvi">
-                                  <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="4MEOIDGCfj8" role="2OqNvi">
-                    <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2tJIrI" id="4MEOIDGBrv_" role="jymVt" />
           <node concept="3clFb_" id="1GNw78$ri7u" role="jymVt">
             <property role="TrG5h" value="init" />
             <node concept="3cqZAl" id="1GNw78$ri7v" role="3clF45" />
@@ -18925,111 +18796,6 @@
           </node>
         </node>
         <node concept="2tJIrI" id="4MEOIDG_fi5" role="jymVt" />
-        <node concept="3clFb_" id="4MEOIDG_iAp" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="patternTypeTerm" />
-          <node concept="3uibUv" id="4MEOIDG_iAq" role="3clF45">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-          </node>
-          <node concept="3Tm1VV" id="4MEOIDG_iAr" role="1B3o_S" />
-          <node concept="2AHcQZ" id="4MEOIDG_iAw" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-          <node concept="3clFbS" id="4MEOIDG_iAx" role="3clF47">
-            <node concept="3clFbF" id="4MEOIDG_qKe" role="3cqZAp">
-              <node concept="2OqwBi" id="4MEOIDG_qKg" role="3clFbG">
-                <node concept="1eOMI4" id="4MEOIDG_qKh" role="2Oq$k0">
-                  <node concept="1nCR9W" id="4MEOIDG_qKi" role="1eOMHV">
-                    <property role="1nD$Q0" value="TermDeclaration" />
-                    <node concept="3clFbT" id="4MEOIDG_qKj" role="2U2pNA">
-                      <property role="3clFbU" value="true" />
-                    </node>
-                    <node concept="10Nm6u" id="4MEOIDG_qKk" role="2U2pNA">
-                      <node concept="1WS0z7" id="4MEOIDG_qKl" role="lGtFl">
-                        <node concept="3JmXsc" id="4MEOIDG_qKm" role="3Jn$fo">
-                          <node concept="3clFbS" id="4MEOIDG_qKn" role="2VODD2">
-                            <node concept="3clFbF" id="4MEOIDG_qKo" role="3cqZAp">
-                              <node concept="2OqwBi" id="4MEOIDG_qKp" role="3clFbG">
-                                <node concept="2OqwBi" id="4MEOIDG_qKq" role="2Oq$k0">
-                                  <node concept="30H73N" id="4MEOIDG_qKs" role="2Oq$k0" />
-                                  <node concept="3TrEf2" id="4MEOIDG_qKu" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                                  </node>
-                                </node>
-                                <node concept="3Tsc0h" id="4MEOIDG_qKv" role="2OqNvi">
-                                  <ref role="3TtcxE" to="wq2x:4MEOIDFttNi" resolve="parameter" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3uibUv" id="4MEOIDG_qKw" role="2lIhxL">
-                      <ref role="3uigEE" to="psr6:4MEOIDFA48I" resolve="AbstractTermDeclaration" />
-                    </node>
-                    <node concept="17Uvod" id="4MEOIDG_qKx" role="lGtFl">
-                      <property role="P4ACc" value="df345b11-b8c7-4213-ac66-48d2a9b75d88/1173996401517/1173996588177" />
-                      <property role="2qtEX9" value="fqClassName" />
-                      <node concept="3zFVjK" id="4MEOIDG_qKy" role="3zH0cK">
-                        <node concept="3clFbS" id="4MEOIDG_qKz" role="2VODD2">
-                          <node concept="3clFbF" id="4MEOIDG_qK$" role="3cqZAp">
-                            <node concept="2OqwBi" id="4MEOIDG_qK_" role="3clFbG">
-                              <node concept="2OqwBi" id="4MEOIDG_qKA" role="2Oq$k0">
-                                <node concept="30H73N" id="4MEOIDG_qKC" role="2Oq$k0" />
-                                <node concept="3TrEf2" id="4MEOIDG_qKE" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="4MEOIDG_qKF" role="2OqNvi">
-                                <ref role="37wK5l" to="x5bw:4MEOIDG8lgz" resolve="runtimeClassFqName" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="liA8E" id="4MEOIDG_qKG" role="2OqNvi">
-                  <ref role="37wK5l" to="psr6:4MEOIDFA4bP" resolve="typeTerm" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2tJIrI" id="1eKXYsjIGC7" role="jymVt" />
-        <node concept="3clFb_" id="60NbDCXH15L" role="jymVt">
-          <property role="1EzhhJ" value="false" />
-          <property role="TrG5h" value="typeTerm" />
-          <node concept="3uibUv" id="60NbDCXH15M" role="3clF45">
-            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="TreeForm" />
-          </node>
-          <node concept="3Tm1VV" id="60NbDCXH15N" role="1B3o_S" />
-          <node concept="37vLTG" id="60NbDCXH15P" role="3clF46">
-            <property role="TrG5h" value="typeNode" />
-            <node concept="3Tqbb2" id="60NbDCXH15Q" role="1tU5fm" />
-          </node>
-          <node concept="3clFbS" id="60NbDCXH15U" role="3clF47">
-            <node concept="3cpWs6" id="20Ay2Ve81mU" role="3cqZAp">
-              <node concept="2OqwBi" id="20Ay2Ve81mV" role="3cqZAk">
-                <node concept="1rXfSq" id="20Ay2Ve81mW" role="2Oq$k0">
-                  <ref role="37wK5l" node="4KRwoelAK47" resolve="withNode" />
-                  <node concept="37vLTw" id="20Ay2Ve81mX" role="37wK5m">
-                    <ref role="3cqZAo" node="60NbDCXH15P" resolve="typeNode" />
-                  </node>
-                </node>
-                <node concept="liA8E" id="20Ay2Ve81mY" role="2OqNvi">
-                  <ref role="37wK5l" node="4MEOIDGBueD" resolve="typeNode" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2AHcQZ" id="60NbDCXH15V" role="2AJF6D">
-            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-          </node>
-        </node>
-        <node concept="2tJIrI" id="60NbDCXH4p6" role="jymVt" />
         <node concept="3clFb_" id="1GNw78$ryBl" role="jymVt">
           <property role="TrG5h" value="bindType" />
           <property role="1EzhhJ" value="false" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index d18a386f..9404e18b 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -2947,9 +2947,6 @@
       <node concept="3F0A7n" id="1pPth$m609g" role="3EZMnx">
         <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
         <ref role="1k5W1q" to="tpen:hshUnm6" resolve="StaticMethod" />
-        <node concept="3nxI2P" id="4MEOIDFQk8l" role="3F10Kt">
-          <property role="VOm3f" value="true" />
-        </node>
       </node>
       <node concept="1iCGBv" id="4MEOIDFQk5Z" role="3EZMnx">
         <ref role="1NtTu8" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
@@ -2959,6 +2956,24 @@
             <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
           </node>
         </node>
+        <node concept="3nxI2P" id="5hSMZ_lLvu7" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pkWqt" id="5hSMZ_lLOs8" role="pqm2j">
+          <node concept="3clFbS" id="5hSMZ_lLOs9" role="2VODD2">
+            <node concept="3clFbF" id="5hSMZ_lLOzu" role="3cqZAp">
+              <node concept="2OqwBi" id="5hSMZ_lLPS1" role="3clFbG">
+                <node concept="2OqwBi" id="5hSMZ_lLOML" role="2Oq$k0">
+                  <node concept="pncrf" id="5hSMZ_lLOzt" role="2Oq$k0" />
+                  <node concept="3TrEf2" id="5hSMZ_lLPnx" role="2OqNvi">
+                    <ref role="3Tt5mk" to="wq2x:4MEOIDF_kTL" resolve="termDecl" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="5hSMZ_lLQoY" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3F0ifn" id="7IysFeA6Upz" role="3EZMnx">
         <property role="3F0ifm" value="for concept" />
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index aa93bc3e..5a842183 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -774,8 +774,9 @@
       <property role="IQ2ns" value="5524459797192461937" />
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="termDecl" />
-      <property role="20lbJX" value="1" />
+      <property role="20lbJX" value="0..1" />
       <ref role="20lvS9" node="4MEOIDFttoe" resolve="TypeTermDeclaration" />
+      <node concept="asaX9" id="5hSMZ_lMoKM" role="lGtFl" />
     </node>
     <node concept="PrWs8" id="1pPth$m5Bb$" role="PzmwI">
       <ref role="PrY4T" to="tpee:hCUYCKd" resolve="IValidIdentifier" />