diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
index 30219009..df388c4a 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/constraints.mps
@@ -20,6 +20,7 @@
     <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.treeform)" />
     <import index="x5bw" ref="r:15ea4f4e-2f41-4ce3-b7e4-a4e0737f0171(jetbrains.mps.lang.typesystem2.behavior)" implicit="true" />
+    <import index="5j4j" ref="r:c8fb1c5e-8204-4904-a38f-678899d447c1(jetbrains.mps.logic.structure)" implicit="true" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -81,6 +82,12 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -90,6 +97,10 @@
         <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -100,6 +111,7 @@
         <child id="6329021646629175155" name="commentPart" index="3SKWNk" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
       </concept>
@@ -194,6 +206,8 @@
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
+      <concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
     </language>
   </registry>
   <node concept="1M2fIO" id="6ntBQ9KM5bM">
@@ -1075,5 +1089,48 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="4bWqD4ClXnL">
+    <ref role="1M2myG" to="wq2x:7LZcKzBrEPK" resolve="TermListExpression" />
+    <node concept="EnEH3" id="4bWqD4ClXnM" role="1MhHOB">
+      <ref role="EomxK" to="wq2x:4bWqD4Cl_wO" resolve="hasNil" />
+      <node concept="Eqf_E" id="4bWqD4ClXnO" role="EtsB7">
+        <node concept="3clFbS" id="4bWqD4ClXnP" role="2VODD2">
+          <node concept="3clFbF" id="4bWqD4ClXva" role="3cqZAp">
+            <node concept="3fqX7Q" id="4bWqD4CmDWS" role="3clFbG">
+              <node concept="1eOMI4" id="4bWqD4CmDWU" role="3fr31v">
+                <node concept="1Wc70l" id="4bWqD4CmDWV" role="1eOMHV">
+                  <node concept="2OqwBi" id="4bWqD4CmDWW" role="3uHU7B">
+                    <node concept="2OqwBi" id="4bWqD4CmDWX" role="2Oq$k0">
+                      <node concept="EsrRn" id="4bWqD4CmDWY" role="2Oq$k0" />
+                      <node concept="3Tsc0h" id="4bWqD4CmDWZ" role="2OqNvi">
+                        <ref role="3TtcxE" to="wq2x:7LZcKzBrEQ$" resolve="contents" />
+                      </node>
+                    </node>
+                    <node concept="3GX2aA" id="4bWqD4CmDX0" role="2OqNvi" />
+                  </node>
+                  <node concept="2OqwBi" id="4bWqD4CmDX1" role="3uHU7w">
+                    <node concept="2OqwBi" id="4bWqD4CmDX2" role="2Oq$k0">
+                      <node concept="2OqwBi" id="4bWqD4CmDX3" role="2Oq$k0">
+                        <node concept="EsrRn" id="4bWqD4CmDX4" role="2Oq$k0" />
+                        <node concept="3Tsc0h" id="4bWqD4CmDX5" role="2OqNvi">
+                          <ref role="3TtcxE" to="wq2x:7LZcKzBrEQ$" resolve="contents" />
+                        </node>
+                      </node>
+                      <node concept="1yVyf7" id="4bWqD4CmDX6" role="2OqNvi" />
+                    </node>
+                    <node concept="1mIQ4w" id="4bWqD4CmDX7" role="2OqNvi">
+                      <node concept="chp4Y" id="4bWqD4CmDX8" role="cj9EA">
+                        <ref role="cht4Q" to="5j4j:2q_78a8W4yS" resolve="Wildcard" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
index 32ec4e0f..a9815dfb 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/editor.mps
@@ -4574,17 +4574,13 @@
     <property role="3GE5qa" value="term" />
     <ref role="1XX52x" to="wq2x:7LZcKzBrEPK" resolve="TermListExpression" />
     <node concept="3EZMnI" id="7LZcKzBrF6K" role="2wV5jI">
-      <node concept="3F0ifn" id="7LZcKzBzqk8" role="3EZMnx">
-        <property role="3F0ifm" value="&lt;" />
-        <ref role="1k5W1q" to="tpen:hY9fg1G" resolve="LeftParenAfterName" />
-      </node>
       <node concept="3F2HdR" id="7LZcKzBrF6U" role="3EZMnx">
-        <property role="2czwfO" value="," />
+        <property role="2czwfO" value="::" />
         <ref role="1NtTu8" to="wq2x:7LZcKzBrEQ$" resolve="contents" />
         <node concept="l2Vlx" id="7LZcKzBrF6W" role="2czzBx" />
         <node concept="tppnM" id="7LZcKzBwGYS" role="sWeuL">
           <node concept="11L4FC" id="7LZcKzBwGYU" role="3F10Kt">
-            <property role="VOm3f" value="true" />
+            <property role="VOm3f" value="false" />
           </node>
           <node concept="11LMrY" id="7LZcKzBwGYZ" role="3F10Kt">
             <property role="VOm3f" value="false" />
@@ -4594,9 +4590,45 @@
           <property role="ilYzB" value="empty" />
         </node>
       </node>
-      <node concept="3F0ifn" id="7LZcKzBzqkq" role="3EZMnx">
-        <property role="3F0ifm" value="&gt;" />
-        <ref role="1k5W1q" to="tpen:hFCSUmN" resolve="RightParen" />
+      <node concept="3EZMnI" id="4bWqD4Cl_xd" role="3EZMnx">
+        <node concept="VPM3Z" id="4bWqD4Cl_xf" role="3F10Kt">
+          <property role="VOm3f" value="false" />
+        </node>
+        <node concept="3F0ifn" id="4bWqD4Cl_xu" role="3EZMnx">
+          <property role="3F0ifm" value="::" />
+          <node concept="pkWqt" id="4bWqD4CmG3b" role="pqm2j">
+            <node concept="3clFbS" id="4bWqD4CmG3c" role="2VODD2">
+              <node concept="3clFbF" id="4bWqD4CmGcP" role="3cqZAp">
+                <node concept="2OqwBi" id="4bWqD4CmIsI" role="3clFbG">
+                  <node concept="2OqwBi" id="4bWqD4CmGpM" role="2Oq$k0">
+                    <node concept="pncrf" id="4bWqD4CmGcO" role="2Oq$k0" />
+                    <node concept="3Tsc0h" id="4bWqD4CmGHR" role="2OqNvi">
+                      <ref role="3TtcxE" to="wq2x:7LZcKzBrEQ$" resolve="contents" />
+                    </node>
+                  </node>
+                  <node concept="3GX2aA" id="4bWqD4CmLkc" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3F0ifn" id="4bWqD4Cl_x$" role="3EZMnx">
+          <property role="3F0ifm" value="nil" />
+          <ref role="1k5W1q" node="4aJUH_hW38r" resolve="RuleKeyword" />
+        </node>
+        <node concept="l2Vlx" id="4bWqD4Cl_xi" role="2iSdaV" />
+        <node concept="pkWqt" id="4bWqD4CmhvZ" role="pqm2j">
+          <node concept="3clFbS" id="4bWqD4Cmhw0" role="2VODD2">
+            <node concept="3clFbF" id="4bWqD4CmhBd" role="3cqZAp">
+              <node concept="2OqwBi" id="4bWqD4CmhOa" role="3clFbG">
+                <node concept="pncrf" id="4bWqD4CmhBc" role="2Oq$k0" />
+                <node concept="3TrcHB" id="4bWqD4Cmi7U" role="2OqNvi">
+                  <ref role="3TsBF5" to="wq2x:4bWqD4Cl_wO" resolve="hasNil" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="l2Vlx" id="7LZcKzBrF6N" role="2iSdaV" />
     </node>
diff --git a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
index 065e940a..360061cf 100644
--- a/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
+++ b/typesystem2/languages/jetbrains.mps.lang.typesystem2/languageModels/structure.mps
@@ -1188,6 +1188,11 @@
     <property role="TrG5h" value="TermListExpression" />
     <property role="34LRSv" value="termlist" />
     <ref role="1TJDcQ" to="tpee:fz3vP1J" resolve="Expression" />
+    <node concept="1TJgyi" id="4bWqD4Cl_wO" role="1TKVEl">
+      <property role="IQ2nx" value="4826850072313878580" />
+      <property role="TrG5h" value="hasNil" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="1TJgyj" id="7LZcKzBrEQ$" role="1TKVEi">
       <property role="IQ2ns" value="8970945096080862628" />
       <property role="20lmBu" value="aggregation" />